#3666 Fix for NPE with filterMany() containing or()

For FilterMany with QueryBeans, it creates a queryBean to build the filterMany predicates with. This query bean needed 2 changes for this fix: 1. Needs to set it's internal "root" such that it supports chaining (required for or() etc) 2. The ExpressionFactory needs to be explicitly passed to the expression list (rather than get it from the query which is actually null in this case).
2026-09-20 11:17:36 +00:00 · 2025-08-30 09:29:25 +12:00
194 changed files with 561 additions and 2994 deletions
@@ -40,5 +40,5 @@ jobs:
 #    - name: Maven single test
 #      run: mvn --batch-mode clean verify -Dtest="io.ebeaninternal.server.core.DefaultServer_getReferenceTest" -DfailIfNoTests=false
    - name: Build with Maven
-      run: mvn -T 8 clean test -Pdefault
+      run: mvn -T 8 clean test

@@ -37,5 +37,5 @@ jobs:
    - name: Maven version
      run: mvn --version
    - name: Build with Maven
-      run: mvn test -Pea
+      run: mvn -T 8 test

@@ -3,7 +3,6 @@
 [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ebean-orm/ebean/blob/master/LICENSE)
 [![Multi-JDK Build](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml)
-[![GraalVM Native Image](https://img.shields.io/badge/GraalVM-Native%20Image%20Ready-darkgreen?logo=graalvm)](https://www.graalvm.org/)

 ##### Build with database platforms
 [![H2Database](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml)
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-net-postgis-types</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <artifactId>ebean-parent</artifactId>
-    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
-    <relativePath>../..</relativePath>
-  </parent>
-
-  <name>ebean-pgvector</name>
-  <description>ebean-pgvector composite</description>
-  <artifactId>ebean-pgvector</artifactId>
-
-  <properties>
-    <pgvector.version>0.1.6</pgvector.version>
-    <postgres.jdbc.version>42.7.2</postgres.jdbc.version>
-  </properties>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>${ebean-datasource.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>${ebean-migration.version}</version>
-    </dependency>
-
-    <!-- Technically optional but most expected to use query beans -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.4.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-pgvector-types</artifactId>
-      <version>16.4.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>${postgres.jdbc.version}</version>
-      <exclusions>
-        <!-- exclude unnecessary checker framework -->
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>com.pgvector</groupId>
-      <artifactId>pgvector</artifactId>
-      <version>${pgvector.version}</version>
-    </dependency>
-
-  </dependencies>
-</project>
@@ -1,7 +0,0 @@
-package io.ebean.pgvector.assembly;
-
-/**
- * Nothing interesting here - required placeholder for javadoc.
- */
-public class Assembly {
-}
@@ -1,9 +0,0 @@
-module io.ebean.pgvector {
-
-  requires transitive io.ebean.api;
-  requires transitive io.ebean.core;
-  requires transitive io.ebean.datasource;
-  requires transitive io.ebean.querybean;
-  requires transitive io.ebean.platform.postgres;
-
-}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -41,7 +41,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -60,13 +60,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
  </parent>

  <artifactId>composites</artifactId>
@@ -25,7 +25,6 @@
    <module>ebean-postgres</module>
    <module>ebean-postgis</module>
    <module>ebean-net-postgis</module>
-    <module>ebean-pgvector</module>
 <!--    <module>sqlanywhere</module>-->
    <module>ebean-sqlite</module>
    <module>ebean-sqlserver</module>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
  </parent>

  <name>ebean api</name>
@@ -35,7 +35,7 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-config</artifactId>
-      <version>4.2</version>
+      <version>4.1</version>
    </dependency>

    <dependency>
@@ -989,14 +989,6 @@ public interface DatabaseBuilder {
  @Deprecated
  DatabaseBuilder setNamingConvention(NamingConvention namingConvention);

-  /**
-   * Set the AggregateFormulaContext which is used to determine if a database function
-   * is an aggregate function (like sum, min, max, avg etc).
-   * <p>
-   * Use this to override the default known aggregation functions.
-   */
-  DatabaseConfig aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext);
-
  /**
   * Set to true if all DB column and table names should use quoted identifiers.
   * <p>
@@ -2618,11 +2610,6 @@ public interface DatabaseBuilder {
     */
    NamingConvention getNamingConvention();

-    /**
-     * Return the AggregateFormulaContext.
-     */
-    AggregateFormulaContext aggregateFormulaContext();
-
    /**
     * Return true if all DB column and table names should use quoted identifiers.
     */
@@ -234,16 +234,5 @@ public interface DtoQuery<T> extends CancelableQuery {
   * source. We use {@code usingMaster()} to instead ensure that the query is executed
   * against the master data source.
   */
-  default DtoQuery<T> usingMaster() {
-    return usingMaster(true);
-  }
-
-  /**
-   * Ensure the master DataSource is used when useMaster is true. Otherwise, the read only
-   * data source can be used if defined.
-   *
-   * @see #usingMaster()
-   */
-  DtoQuery<T> usingMaster(boolean useMaster);
-
+  DtoQuery<T> usingMaster();
 }
@@ -1,7 +1,6 @@
 package io.ebean;

 import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;

 /**
 * Object relational query for finding a List, Set, Map or single entity bean.
@@ -311,7 +310,6 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
  /**
   * Return the Id value.
   */
-  @Nullable
  Object getId();

  /**
@@ -448,13 +446,11 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
  /**
   * Return the "for update" wait mode to use.
   */
-  @Nullable
  LockWait getForUpdateLockWait();

  /**
   * Return the lock type (strength) to use with "for update".
   */
-  @Nullable
  LockType getForUpdateLockType();

  /**
@@ -135,17 +135,7 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
   * against the master data source.
   */
-  default SELF usingMaster() {
-    return usingMaster(true);
-  }
-
-  /**
-   * Ensure the master DataSource is used when useMaster is true. Otherwise, the read only
-   * data source can be used if defined.
-   *
-   * @see #usingMaster()
-   */
-  SELF usingMaster(boolean useMaster);
+  SELF usingMaster();

  /**
   * Set the base table to use for this query.
@@ -403,12 +393,6 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   * This means that the returning graph can't be mutated via setters, all the collections
   * are unmodifiable collections, lazy loading is disabled and that the query uses
   * {@link PersistenceContextScope#QUERY}.
-   * <p>
-   * Attempting to mutate an unmodifiable bean will throw a <code>UnmodifiableEntityException</code>.
-   * Attempting to load an unloaded property will throw a <code>LazyInitialisationException</code>
-   *
-   * @see LazyInitialisationException
-   * @see UnmodifiableEntityException
   */
  SELF setUnmodifiable(boolean unmodifiable);

@@ -457,16 +441,6 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que

  /**
   * Set the {@link CacheMode} to use the query for executing this query.
-   * <p>
-   * Since version 16.x using the query bean will set the query to use unmodifiable (see
-   * {@link #setUnmodifiable(boolean)}) so the returned object graph is unmodifiable
-   * and safe to cache by the application.
-   * <p>
-   * Attempting to mutate an unmodifiable bean will throw a <code>UnmodifiableEntityException</code>.
-   * Attempting to load an unloaded property will throw a <code>LazyInitialisationException</code>
-   *
-   * @see LazyInitialisationException
-   * @see UnmodifiableEntityException
   */
  SELF setUseQueryCache(CacheMode cacheMode);

@@ -63,17 +63,7 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   * source. We use {@code usingMaster()} to instead ensure that the query is executed
   * against the master data source.
   */
-  default SqlQuery usingMaster() {
-    return usingMaster(true);
-  }
-
-  /**
-   * Ensure the master DataSource is used when useMaster is true. Otherwise, the read only
-   * data source can be used if defined.
-   *
-   * @see #usingMaster()
-   */
-  SqlQuery usingMaster(boolean useMaster);
+  SqlQuery usingMaster();

  /**
   * Execute the query returning a list.
@@ -1,66 +0,0 @@
-package io.ebean.config;
-
-import java.util.Set;
-
-/**
- * Used when parsing formulas to determine if they are aggregation formulas like
- * sum, min, max, avg, count etc.
- * <p>
- * Ebean needs to determine if they are aggregation formulas to determine which
- * properties should be included in a GROUP BY clause etc.
- */
-public interface AggregateFormulaContext {
-
-  /**
-   * Return true if the outer function is an aggregate function (like sum, count, min, max, avg etc).
-   */
-  boolean isAggregate(String outerFunction);
-
-  /**
-   * Return true if the aggregate function returns a BIGINT type.
-   * This is true for functions like count that return a numeric value regardless of the
-   * type of the property or expression inside the outer function.
-   */
-  boolean isCount(String outerFunction);
-
-  /**
-   * Return true if the aggregate function returns a VARCHAR type.
-   * This is true for functions that return a string concatenation like group_concat etc
-   * regardless of the type of the property used inside the outer function.
-   */
-  boolean isConcat(String outerFunction);
-
-  /**
-   * Return a builder for the AggregateFormulaContext.
-   */
-  static Builder builder() {
-    return new AggregateFormulaContextBuilder();
-  }
-
-  /**
-   * A builder for the AggregateFormulaContext.
-   */
-  interface Builder {
-
-    /**
-     * Override the default set of aggregation functions.
-     */
-    Builder aggregateFunctions(Set<String> count);
-
-    /**
-     * Override the default set of concat functions.
-     */
-    Builder concatFunctions(Set<String> concat);
-
-    /**
-     * Override the default set of count functions.
-     */
-    Builder countFunctions(Set<String> count);
-
-    /**
-     * Build the AggregateFormulaContext.
-     */
-    AggregateFormulaContext build();
-  }
-
-}
@@ -1,61 +0,0 @@
-package io.ebean.config;
-
-import java.util.Set;
-
-final class AggregateFormulaContextBuilder implements AggregateFormulaContext.Builder {
-
-  private Set<String> aggFunctions = Set.of("count", "max", "min", "avg", "sum", "group_concat", "string_agg", "listagg");
-  private Set<String> concat = Set.of("concat", "group_concat", "string_agg", "listagg");
-  private Set<String> count = Set.of("count");
-
-  @Override
-  public AggregateFormulaContext.Builder aggregateFunctions(Set<String> agg) {
-    this.aggFunctions = agg;
-    return this;
-  }
-
-  @Override
-  public AggregateFormulaContext.Builder concatFunctions(Set<String> concat) {
-    this.concat = concat;
-    return this;
-  }
-
-  @Override
-  public AggregateFormulaContext.Builder countFunctions(Set<String> count) {
-    this.count = count;
-    return this;
-  }
-
-  @Override
-  public AggregateFormulaContext build() {
-    return new FormulaContext(aggFunctions, concat, count);
-  }
-
-  private static final class FormulaContext implements AggregateFormulaContext {
-
-    private final Set<String> aggFunctions;
-    private final Set<String> concat;
-    private final Set<String> count;
-
-    private FormulaContext(Set<String> aggFunctions, Set<String> concat, Set<String> count) {
-      this.aggFunctions = aggFunctions;
-      this.concat = concat;
-      this.count = count;
-    }
-
-    @Override
-    public boolean isAggregate(String outerFunction) {
-      return aggFunctions.contains(outerFunction);
-    }
-
-    @Override
-    public boolean isCount(String outerFunction) {
-      return count.contains(outerFunction);
-    }
-
-    @Override
-    public boolean isConcat(String outerFunction) {
-      return concat.contains(outerFunction);
-    }
-  }
-}
@@ -356,8 +356,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   */
  private NamingConvention namingConvention = new UnderscoreNamingConvention();

-  private AggregateFormulaContext aggregateFormulaContext = AggregateFormulaContext.builder().build();
-
  /**
   * Behaviour of updates in JDBC batch to by default include all properties.
   */
@@ -1281,17 +1279,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return this;
  }

-  @Override
-  public AggregateFormulaContext aggregateFormulaContext() {
-    return aggregateFormulaContext;
-  }
-
-  @Override
-  public DatabaseConfig aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext) {
-    this.aggregateFormulaContext = aggregateFormulaContext;
-    return this;
-  }
-
  @Override
  public boolean isAllQuotedIdentifiers() {
    return platformConfig.isAllQuotedIdentifiers();
@@ -46,18 +46,6 @@ public class DbPlatformTypeMapping {
  private static final DbPlatformType MULTILINESTRING = new DbPlatformType("multilinestring");
  private static final DbPlatformType MULTIPOLYGON = new DbPlatformType("multipolygon");

-  private static final DbPlatformType VECTOR = new DbPlatformType("vector", 2000, null);
-  private static final DbPlatformType VECTOR_HALF = new DbPlatformType("halfvec", 4000, null);
-  private static final DbPlatformType VECTOR_BIT = new DbPlatformType("bit", 64000, null);
-  private static final DbPlatformType VECTOR_SPARSE = new DbPlatformType("sparsevec", 1000, null);
-
-  /**
-   * Timestamp with max precision of 15, and fallback to plain timestamp without precision defined.
-   */
-  private static final DbPlatformType TIMESTAMP =
-    new DbPlatformType("timestamp", 0, 15,
-      new DbPlatformType("timestamp", false));
-
  private final Map<DbType, DbPlatformType> typeMap = new EnumMap<>(DbType.class);

  /**
@@ -94,8 +82,7 @@ public class DbPlatformTypeMapping {
    put(DbType.ARRAY);
    put(DbType.DATE);
    put(DbType.TIME);
-    put(DbType.TIMESTAMP, TIMESTAMP);
-
+    put(DbType.TIMESTAMP);
    put(DbType.LONGVARBINARY);
    put(DbType.LONGVARCHAR);
    // most commonly real maps to db float
@@ -106,10 +93,6 @@ public class DbPlatformTypeMapping {
    put(DbType.MULTIPOINT, MULTIPOINT);
    put(DbType.MULTILINESTRING, MULTILINESTRING);
    put(DbType.MULTIPOLYGON, MULTIPOLYGON);
-    put(DbType.VECTOR, VECTOR);
-    put(DbType.VECTOR_HALF, VECTOR_HALF);
-    put(DbType.VECTOR_BIT, VECTOR_BIT);
-    put(DbType.VECTOR_SPARSE, VECTOR_SPARSE);

    if (logicalTypes) {
      // keep it logical for 2 layer DDL generation
@@ -51,12 +51,7 @@ public enum DbType {
  JSONB(ExtraDbTypes.JSONB),
  JSONCLOB(ExtraDbTypes.JSONClob),
  JSONBLOB(ExtraDbTypes.JSONBlob),
-  JSONVARCHAR(ExtraDbTypes.JSONVarchar),
-
-  VECTOR(ExtraDbTypes.VECTOR),
-  VECTOR_HALF(ExtraDbTypes.VECTOR_HALF),
-  VECTOR_BIT(ExtraDbTypes.VECTOR_BIT),
-  VECTOR_SPARSE(ExtraDbTypes.VECTOR_SPARSE);
+  JSONVARCHAR(ExtraDbTypes.JSONVarchar);

  private final int id;

@@ -74,24 +74,4 @@ public interface ExtraDbTypes {
   */
  int MULTILINESTRING = 6007;

-  /**
-   * PGVector base type
-   */
-  int VECTOR = 7000;
-
-  /**
-   * PGVector half precision float type
-   */
-  int VECTOR_HALF = 7001;
-
-  /**
-   * PGVector binary type (bit)
-   */
-  int VECTOR_BIT = 7002;
-
-  /**
-   * PGVector sparse type
-   */
-  int VECTOR_SPARSE = 7003;
-
 }
@@ -1,65 +0,0 @@
-package io.ebean.config;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.Set;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class AggregateFormulaContextTest {
-
-  @Test
-  void defaultContext() {
-    var defaultContext = AggregateFormulaContext.builder().build();
-    for (String aggFunction : List.of("count", "max", "min", "avg", "sum", "group_concat", "string_agg", "listagg")) {
-      assertThat(defaultContext.isAggregate(aggFunction)).isTrue();
-    }
-    for (String c : List.of("concat", "group_concat", "string_agg", "listagg")) {
-      assertThat(defaultContext.isConcat(c)).isTrue();
-    }
-    for (String c : List.of("count")) {
-      assertThat(defaultContext.isCount(c)).isTrue();
-    }
-
-    assertThat(defaultContext.isConcat("junk")).isFalse();
-    assertThat(defaultContext.isCount("junk")).isFalse();
-    assertThat(defaultContext.isAggregate("junk")).isFalse();
-  }
-
-  @Test
-  void overrideAggregateFunctions() {
-    AggregateFormulaContext mySum = AggregateFormulaContext.builder()
-      .aggregateFunctions(Set.of("my_sum"))
-      .build();
-
-    assertThat(mySum.isAggregate("my_sum")).isTrue();
-    assertThat(mySum.isAggregate("avg")).isFalse();
-    assertThat(mySum.isCount("count")).isTrue();
-    assertThat(mySum.isConcat("group_concat")).isTrue();
-  }
-
-  @Test
-  void overrideConcatFunctions() {
-    AggregateFormulaContext myConcat = AggregateFormulaContext.builder()
-      .concatFunctions(Set.of("my_concat"))
-      .build();
-
-    assertThat(myConcat.isAggregate("avg")).isTrue();
-    assertThat(myConcat.isCount("count")).isTrue();
-    assertThat(myConcat.isConcat("group_concat")).isFalse();
-    assertThat(myConcat.isConcat("my_concat")).isTrue();
-  }
-
-  @Test
-  void overrideCountFunctions() {
-    AggregateFormulaContext myCount = AggregateFormulaContext.builder()
-      .countFunctions(Set.of("my_count"))
-      .build();
-
-    assertThat(myCount.isAggregate("avg")).isTrue();
-    assertThat(myCount.isCount("count")).isFalse();
-    assertThat(myCount.isCount("my_count")).isTrue();
-    assertThat(myCount.isConcat("group_concat")).isTrue();
-  }
-}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
  </parent>

  <name>ebean bom</name>
@@ -89,25 +89,25 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
@@ -125,13 +125,13 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
@@ -155,37 +155,37 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <!-- platforms -->
@@ -193,91 +193,79 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-clickhouse</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>16.4.0</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-pgvector</artifactId>
-        <version>16.4.0</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-pgvector-types</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>16.4.0</version>
+        <version>16.0.0</version>
      </dependency>

    </dependencies>
@@ -3,7 +3,7 @@
  <parent>
    <groupId>io.ebean</groupId>
    <artifactId>ebean-parent</artifactId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
  </parent>
  <artifactId>ebean-core-json</artifactId>
  <name>ebean-core-json</name>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <!-- Jackson core used internally by Ebean -->
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.4.0</version>
+    <version>16.0.0</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-json</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -52,7 +52,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -165,21 +165,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.4.0</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -1,10 +0,0 @@
-package io.ebeaninternal.api;
-
-import io.ebean.config.AggregateFormulaContext;
-import io.ebeaninternal.server.query.STreeProperty;
-
-public interface FormulaBuilder {
-
-  STreeProperty create(AggregateFormulaContext context, String formula, String path);
-
-}
@@ -41,7 +41,7 @@ final class NaturalKeyEntryBasic implements NaturalKeyEntry {
   * Create when query uses an IN PAIRS clause.
   */
  NaturalKeyEntryBasic(BeanNaturalKey naturalKey, List<NaturalKeyEq> eqList,
-                       String inMapProperty0, String inMapProperty1, Pairs.Entry pair) {
+                        String inMapProperty0, String inMapProperty1, Pairs.Entry pair) {
    load(eqList);
    map.put(inMapProperty0, pair.getA());
    map.put(inMapProperty1, pair.getB());
@@ -49,14 +49,6 @@ final class NaturalKeyEntryBasic implements NaturalKeyEntry {
    this.key = calculateKey(naturalKey);
  }

-  NaturalKeyEntryBasic(BeanNaturalKey naturalKey, List<NaturalKeyEq> eqList,
-                       Map<String, Object> properties, Object[] naturalKeyValue) {
-    load(eqList);
-    map.putAll(properties);
-    this.inValue = naturalKeyValue;
-    this.key = calculateKey(naturalKey);
-  }
-
  private void load(List<NaturalKeyEq> eqList) {
    if (eqList != null) {
      for (NaturalKeyEq eq : eqList) {
@@ -3,7 +3,10 @@ package io.ebeaninternal.api;
 import io.ebean.Pairs;
 import io.ebeaninternal.server.deploy.BeanNaturalKey;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;

 /**
 * Collects the data for processing the natural key cache processing.
@@ -16,9 +19,8 @@ public final class NaturalKeyQueryData<T> {
   */
  private boolean hasIn;
  // IN Pairs clause - only one allowed
+  private String inProperty0, inProperty1;
  private List<Pairs.Entry> inPairs;
-  private String[] properties;
-  private List<Object[]> inTuples;
  // IN clause - only one allowed
  private List<Object> inValues;
  private String inProperty;
@@ -45,39 +47,14 @@ public final class NaturalKeyQueryData<T> {
    }
    if (matchProperty(property0) && matchProperty(property1)) {
      this.hasIn = true;
-      this.properties = new String[]{property0, property1};
+      this.inProperty0 = property0;
+      this.inProperty1 = property1;
      this.inPairs = new ArrayList<>(inPairs); // will be modified
      return this.inPairs;
    }
    return null;
  }

-  /**
-   * Match for In Tuples expression. We only allow one IN clause.
-   */
-  public List<Object[]> matchInTuples(String[] properties, List<Object[]> inTuples) {
-    if (hasIn) {
-      // only 1 IN allowed (to project naturalIds)
-      return null;
-    }
-
-    boolean matchAll = true;
-
-    for (String property : properties) {
-      if (!matchProperty(property)) {
-        matchAll = false;
-        break;
-      }
-    }
-    if (matchAll) {
-      this.hasIn = true;
-      this.properties = Arrays.copyOf(properties, properties.length);
-      this.inTuples = new ArrayList<>(inTuples);
-      return this.inTuples;
-    }
-    return null;
-  }
-
  /**
   * Match for IN expression. We only allow one IN clause.
   */
@@ -123,8 +100,6 @@ public final class NaturalKeyQueryData<T> {
      addInValues();
    } else if (inPairs != null) {
      addInPairs();
-    } else if (inTuples != null) {
-      addInTuples();
    } else {
      addEqualsKey();
    }
@@ -135,17 +110,7 @@ public final class NaturalKeyQueryData<T> {
    // a findList() with an IN Map clause so we project
    // for every IN value a natural key combination
    for (Pairs.Entry entry : inPairs) {
-      set.add(new NaturalKeyEntryBasic(naturalKey, eqList, properties[0], properties[1], entry));
-    }
-  }
-
-  private void addInTuples() {
-    for (Object[] inTuple : inTuples) {
-      Map<String, Object> map = new HashMap<>();
-      for (int i = 0; i < inTuple.length; i++) {
-        map.put(properties[i], inTuple[i]);
-      }
-      set.add(new NaturalKeyEntryBasic(naturalKey, eqList, map, inTuple));
+      set.add(new NaturalKeyEntryBasic(naturalKey, eqList, inProperty0, inProperty1, entry));
    }
  }

@@ -187,8 +152,11 @@ public final class NaturalKeyQueryData<T> {
    if (inProperty != null) {
      exprProps.add(inProperty);
    }
-    if (properties != null) {
-      exprProps.addAll(Arrays.asList(properties));
+    if (inProperty0 != null) {
+      exprProps.add(inProperty0);
+    }
+    if (inProperty1 != null) {
+      exprProps.add(inProperty1);
    }
    if (eqList != null) {
      for (NaturalKeyEq eq : eqList) {
@@ -205,7 +173,6 @@ public final class NaturalKeyQueryData<T> {
    int defined = (inValues == null) ? 0 : 1;
    defined += (inPairs == null) ? 0 : 2;
    defined += (eqList == null) ? 0 : eqList.size();
-    defined += (inTuples == null) ? 0 : properties.length;
    return defined == naturalKey.length();
  }

@@ -239,9 +206,6 @@ public final class NaturalKeyQueryData<T> {
    } else if (inPairs != null) {
      //noinspection SuspiciousMethodCalls
      inPairs.remove(inValue);
-    } else if (inTuples != null) {
-      //noinspection SuspiciousMethodCalls
-      inTuples.remove(inValue);
    }
  }
 }
@@ -14,9 +14,4 @@ public interface SpiBeanType {
   * or removals from the collection.
   */
  boolean isToManyDirty(EntityBean bean);
-
-  /**
-   * Return the FormulaBuilder for this type.
-   */
-  FormulaBuilder formulaBuilder();
 }
@@ -1,6 +1,5 @@
 package io.ebeaninternal.api;

-import io.ebeaninternal.server.query.STreeProperty;
 import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebean.bean.BeanCollectionLoader;
@@ -378,6 +377,4 @@ public interface SpiEbeanServer extends SpiServer, BeanCollectionLoader {

  @Nullable
  SqlRow findOne(SpiSqlQuery query);
-
-  <T> STreeProperty createFormulaProperty(SpiBeanType desc, String formula, String path);
 }
@@ -15,4 +15,8 @@ public interface SpiQueryManyJoin {
   */
  String fetchOrderBy();

+  /**
+   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
+   */
+  String idNullOr(String filterManyExpression);
 }
@@ -65,12 +65,12 @@ public interface SpiTransaction extends Transaction {
   * <p>
   * This is to handle bi-directional relationships where both sides Cascade.
   */
-  void registerDeleteBean(Class<?> type, Object id);
+  void registerDeleteBean(Integer hash);

  /**
   * Return true if this is a bean that has already been saved/deleted.
   */
-  boolean isRegisteredDeleteBean(Class<?> type, Object id);
+  boolean isRegisteredDeleteBean(Integer hash);

  /**
   * Unregister the persisted beans. Expected after persisting top level beans
@@ -338,6 +338,11 @@ public interface SpiTransaction extends Transaction {
   */
  boolean isNestedUseSavepoint();

+  /**
+   * Return true if explicitly set to skip cache (ignores skipOnWrite).
+   */
+  boolean isSkipCacheExplicit();
+
  /**
   * Fire pre commit processing/listeners.
   */
@@ -169,6 +169,11 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
    transaction.setSkipCache(skipCache);
  }

+  @Override
+  public boolean isSkipCacheExplicit() {
+    return transaction.isSkipCacheExplicit();
+  }
+
  @Override
  public boolean isSkipCache() {
    return transaction.isSkipCache();
@@ -190,13 +195,13 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
  }

  @Override
-  public void registerDeleteBean(Class<?> type, Object id) {
-    transaction.registerDeleteBean(type, id);
+  public void registerDeleteBean(Integer hash) {
+    transaction.registerDeleteBean(hash);
  }

  @Override
-  public boolean isRegisteredDeleteBean(Class<?> type, Object id) {
-    return transaction.isRegisteredDeleteBean(type, id);
+  public boolean isRegisteredDeleteBean(Integer hash) {
+    return transaction.isRegisteredDeleteBean(hash);
  }

  @Override
@@ -113,7 +113,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  private final long slowQueryMicros;
  private final SlowQueryListener slowQueryListener;
  private final boolean disableL2Cache;
-  private final AggregateFormulaContext formulaContext;
  private boolean shutdown;

  /**
@@ -129,7 +128,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    this.backgroundExecutor = config.getBackgroundExecutor();
    this.extraMetrics = config.getExtraMetrics();
    this.serverName = this.config.getName();
-    this.formulaContext = config.getConfig().aggregateFormulaContext();
    this.lazyLoadBatchSize = this.config.getLazyLoadBatchSize();
    this.cqueryEngine = config.getCQueryEngine();
    this.expressionFactory = config.getExpressionFactory();
@@ -930,11 +928,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    return findId(query);
  }

-  @Override
-  public <T> STreeProperty createFormulaProperty(SpiBeanType desc, String formula, String path) {
-    return desc.formulaBuilder().create(formulaContext, formula, path);
-  }
-
  <T> SpiOrmQueryRequest<T> createQueryRequest(Type type, SpiQuery<T> query) {
    SpiOrmQueryRequest<T> request = buildQueryRequest(type, query);
    request.prepareQuery();
@@ -497,6 +497,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return cacheKey != null && query.queryCacheMode().isPut();
  }

+  public boolean isBeanCachePutMany() {
+    return !transaction.isSkipCacheExplicit() && query.isBeanCachePut();
+  }
+
  public boolean isBeanCachePut() {
    return !transaction.isSkipCache() && query.isBeanCachePut();
  }
@@ -54,6 +54,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   * The unique id used for logging summary.
   */
  private Object idValue;
+  /**
+   * Hash value used to handle cascade delete both ways in a relationship.
+   */
+  private Integer beanHash;
  private boolean statelessUpdate;
  private boolean notifyCache;
  /**
@@ -281,9 +285,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
  private void onFailedUpdateUndoGeneratedProperties() {
    for (BeanProperty prop : beanDescriptor.propertiesGenUpdate()) {
      Object oldVal = intercept.origValue(prop.propertyIndex());
-      if (oldVal != null) {
-        prop.setValue(entityBean, oldVal);
-      }
+      prop.setValue(entityBean, oldVal);
    }
  }

@@ -551,17 +553,34 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    }
  }

+  /**
+   * The hash used to register the bean with the transaction.
+   * <p>
+   * Takes into account the class type and id value.
+   */
+  private Integer beanHash() {
+    if (beanHash == null) {
+      Object id = beanDescriptor.getId(entityBean);
+      int hc = 92821 * bean.getClass().getName().hashCode();
+      if (id != null) {
+        hc += id.hashCode();
+      }
+      beanHash = hc;
+    }
+    return beanHash;
+  }
+
  public void registerDeleteBean() {
-    final Object id = beanDescriptor.id(entityBean);
-    transaction.registerDeleteBean(beanDescriptor.type(), id);
+    Integer hash = beanHash();
+    transaction.registerDeleteBean(hash);
  }

  public boolean isRegisteredForDeleteBean() {
    if (transaction == null) {
      return false;
    } else {
-      final Object id = beanDescriptor.id(entityBean);
-      return transaction.isRegisteredDeleteBean(beanDescriptor.type(), id);
+      Integer hash = beanHash();
+      return transaction.isRegisteredDeleteBean(hash);
    }
  }

@@ -790,9 +809,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
  public void checkRowCount(int rowCount) {
    if (rowCount != 1 && rowCount != Statement.SUCCESS_NO_INFO) {
      if (ConcurrencyMode.VERSION == concurrencyMode) {
-        if (type == Type.UPDATE) {
-          onFailedUpdateUndoGeneratedProperties();
-        }
+        onFailedUpdateUndoGeneratedProperties();
        throw new OptimisticLockException("Data has changed. updated row count " + rowCount, null, bean);
      } else if (rowCount == 0 && type == Type.UPDATE) {
        throw new EntityNotFoundException("No rows updated");
@@ -2410,12 +2410,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   */
  private STreeProperty findSqlTreeFormula(String formula, String path) {
    String key = formula + "-" + path;
-    return dynamicProperty.computeIfAbsent(key, (fullKey) -> ebeanServer.createFormulaProperty(this, formula, path));
-  }
-
-  @Override
-  public FormulaBuilder formulaBuilder() {
-    return new DFormulaBuilder(this);
+    return dynamicProperty.computeIfAbsent(key, (fullKey) -> FormulaPropertyPath.create(this, formula, path));
  }

  /**
@@ -36,6 +36,11 @@ public final class BeanFkeyProperty implements ElPropertyValue {
    return "prefix:" + prefix + " name:" + name + " dbColumn:" + dbColumn + " ph:" + placeHolder;
  }

+  @Override
+  public String idNullOr(String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
+
  @Override
  public boolean isAggregation() {
    return false;
@@ -513,6 +513,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    return owningType.isAssignableFrom(type);
  }

+  @Override
+  public String idNullOr(String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
+
  @Override
  public void loadIgnore(DbReadContext ctx) {
    ctx.dataReader().incrementPos(1);
@@ -436,15 +436,14 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    }
    TableJoinColumn[] cols = join.columns();
    if (!idProp.isEmbedded()) {
-      // simple single scalar id, match on the foreign column, allow extra TableJoinColumn for #3664
-      String matchColumn = idProp.dbColumn();
-      for (TableJoinColumn col : cols) {
-        if (matchColumn.equals(col.getForeignDbColumn())) {
-          return createImportedScalar(owner, col, new BeanProperty[]{idProp}, others);
-        }
+      // simple single scalar id
+      if (cols.length != 1) {
+        CoreLog.log.log(ERROR, "No Imported Id column for {0} in table {1}", idProp, join.getTable());
+        return null;
+      } else {
+        BeanProperty[] idProps = {idProp};
+        return createImportedScalar(owner, cols[0], idProps, others);
      }
-      CoreLog.log.log(ERROR, "No Imported Id column for {0} in table {1}", idProp, join.getTable());
-      return null;
    } else {
      // embedded id
      BeanPropertyAssocOne<?> embProp = (BeanPropertyAssocOne<?>) idProp;
@@ -634,6 +634,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    return fetchOrderBy;
  }

+  @Override
+  public String idNullOr(String filterManyExpression) {
+    return targetIdBinder.idNullOr(name, filterManyExpression);
+  }
+
  /**
   * Return the order by for use when lazy loading the associated collection.
   */
@@ -128,6 +128,16 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
          throw new PersistenceException("Cannot find imported id for " + fullName() + " from " + targetDescriptor
          + ". If using native-image, possibly missing reflect-config for the Id property.");
        }
+        if (importedId.isScalar()) {
+          // limit JoinColumn mapping to the @Id / primary key
+          TableJoinColumn[] columns = tableJoin.columns();
+          String foreignJoinColumn = columns[0].getForeignDbColumn();
+          String foreignIdColumn = targetDescriptor.idProperty().dbColumn();
+          if (!foreignJoinColumn.equalsIgnoreCase(foreignIdColumn)) {
+            throw new PersistenceException("Mapping limitation - @JoinColumn on " + fullName() + " needs to map to a primary key as per Issue #529 "
+              + " - joining to " + foreignJoinColumn + " and not " + foreignIdColumn);
+          }
+        }
      } else {
        exportedProperties = createExported();
        String delStmt = "delete from " + targetDescriptor.baseTable() + " where ";
@@ -1,19 +0,0 @@
-package io.ebeaninternal.server.deploy;
-
-import io.ebean.config.AggregateFormulaContext;
-import io.ebeaninternal.api.FormulaBuilder;
-import io.ebeaninternal.server.query.STreeProperty;
-
-final class DFormulaBuilder implements FormulaBuilder {
-
-  private final BeanDescriptor<?> descriptor;
-
-  DFormulaBuilder(BeanDescriptor<?> descriptor) {
-    this.descriptor = descriptor;
-  }
-
-  @Override
-  public STreeProperty create(AggregateFormulaContext context, String formula, String path) {
-    return FormulaPropertyPath.create(descriptor, context, formula, path);
-  }
-}
@@ -154,9 +154,4 @@ public interface DbSqlContext {
   * as it was already added to the query.
   */
  boolean joinAdded();
-
-  /**
-   * Include the filter many predicates if specified into the JOIN clause.
-   */
-  void includeFilterMany();
 }
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy;

 import io.ebean.core.type.ScalarType;
-import io.ebean.config.AggregateFormulaContext;
 import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.query.STreeProperty;

@@ -10,10 +9,11 @@ import java.util.Set;

 final class FormulaPropertyPath {

+  private static final String[] AGG_FUNCTIONS = {"count", "max", "min", "avg", "sum"};
+
  private static final String DISTINCT_ = "distinct ";

  private final BeanDescriptor<?> descriptor;
-  private final AggregateFormulaContext context;
  private final String formula;
  private final String outerFunction;
  private final String internalExpression;
@@ -24,13 +24,12 @@ final class FormulaPropertyPath {
  private String cast;
  private String alias;

-  static STreeProperty create(BeanDescriptor<?> descriptor, AggregateFormulaContext context, String formula, String path) {
-    return new FormulaPropertyPath(descriptor, context, formula, path).build();
+  static STreeProperty create(BeanDescriptor<?> descriptor, String formula, String path) {
+    return new FormulaPropertyPath(descriptor, formula, path).build();
  }

-  FormulaPropertyPath(BeanDescriptor<?> descriptor, AggregateFormulaContext context, String formula, String path) {
+  FormulaPropertyPath(BeanDescriptor<?> descriptor, String formula, String path) {
    this.descriptor = descriptor;
-    this.context = context;
    this.formula = formula;
    int openBracket = formula.indexOf('(');
    int closeBracket = formula.lastIndexOf(')');
@@ -107,10 +106,10 @@ final class FormulaPropertyPath {
      }
      return create(scalarType);
    }
-    if (context.isCount(outerFunction)) {
+    if (isCount()) {
      return create(descriptor.scalarType(Types.BIGINT));
    }
-    if (context.isConcat(outerFunction)) {
+    if (isConcat()) {
      return create(descriptor.scalarType(Types.VARCHAR));
    }
    if (firstProp == null) {
@@ -145,7 +144,12 @@ final class FormulaPropertyPath {
  }

  private boolean isAggregate() {
-    return context.isAggregate(outerFunction);
+    for (String aggFunction : AGG_FUNCTIONS) {
+      if (aggFunction.equals(outerFunction)) {
+        return true;
+      }
+    }
+    return false;
  }

  private String buildFormula(String parsed) {
@@ -27,6 +27,11 @@ public interface IdBinder {
   */
  void initialise();

+  /**
+   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
+   */
+  String idNullOr(String name, String filterManyExpression);
+
  String idSelect();

  /**
@@ -45,6 +45,20 @@ public final class IdBinderEmbedded implements IdBinder {
    this.idInValueSql = idInExpandedForm ? idInExpanded() : idInCompressed();
  }

+  @Override
+  public String idNullOr(String prefix, String filterManyExpression) {
+    StringBuilder sb = new StringBuilder(100);
+    sb.append("((");
+    for (int i = 0; i < props.length; i++) {
+      if (i > 0) {
+        sb.append(" and ");
+      }
+      sb.append("${").append(prefix).append('}').append(props[i].dbColumn()).append(" is null");
+    }
+    sb.append(") or (").append(filterManyExpression).append("))");
+    return sb.toString();
+  }
+
  @Override
  public String idSelect() {
    return embIdProperty.name();
@@ -28,6 +28,11 @@ final class IdBinderEmpty implements IdBinder {
  public void initialise() {
  }

+  @Override
+  public String idNullOr(String name, String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
+
  @Override
  public String idSelect() {
    return "";
@@ -261,4 +261,9 @@ public final class IdBinderSimple implements IdBinder {
    final Object value = idProperty.getValue(bean);
    return scalarType.format(value);
  }
+
+  @Override
+  public String idNullOr(String prefix, String filterManyExpression) {
+    return "(${" + prefix + "}" + idProperty.dbColumn() + " is null or (" + filterManyExpression + "))";
+  }
 }
@@ -804,9 +804,11 @@ public class DeployBeanDescriptor<T> {
   * Return the defaultSelectClause using FetchType.LAZY and FetchType.EAGER.
   */
  public String getDefaultSelectClause() {
+
    StringBuilder sb = new StringBuilder();

    boolean hasLazyFetch = false;
+
    for (DeployBeanProperty prop : propMap.values()) {
      if (!prop.isTransient() && !(prop instanceof DeployBeanPropertyAssocMany<?>)) {
        if (prop.isFetchEager()) {
@@ -617,8 +617,6 @@ public class DeployBeanProperty {
    this.dbRead = true;
    this.dbInsertable = false;
    this.dbUpdateable = false;
-    // aggregation by default not fetchEager
-    this.fetchEager = false;
  }

  /**
@@ -286,4 +286,8 @@ public final class ElPropertyChain implements ElPropertyValue {
    }
  }

+  @Override
+  public String idNullOr(String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
 }
@@ -12,7 +12,7 @@ final class InTuplesExpression extends AbstractExpression {

  private final boolean not;
  private final String[] properties;
-  private List<Object[]> entries;
+  private final List<Object[]> entries;

  InTuplesExpression(InTuples pairs, boolean not) {
    super("");
@@ -25,15 +25,7 @@ final class InTuplesExpression extends AbstractExpression {

  @Override
  public boolean naturalKey(NaturalKeyQueryData<?> data) {
-    if (not) {
-      return false;
-    }
-    List<Object[]> copy = data.matchInTuples(properties, entries);
-    if (copy == null) {
-      return false;
-    }
-    entries = copy;
-    return true;
+    return false;
  }

  @Override
@@ -329,13 +329,6 @@ public final class Binder {
          geoTypeBinder.bind(b, dataType, data);
          break;

-        case DbPlatformType.VECTOR:
-        case DbPlatformType.VECTOR_HALF:
-        case DbPlatformType.VECTOR_BIT:
-        case DbPlatformType.VECTOR_SPARSE:
-          b.setObject(data);
-          break;
-
        case java.sql.Types.OTHER:
          b.setObject(data, dataType);
          break;
@@ -280,7 +280,7 @@ final class CQueryBuilder {
        sql = wrapSelectCount(sql);
      } else if (wrap || query.isRawSql()) {
        // remove order by - mssql does not accept order by in subqueries
-        int pos = lastTopLevelOrderBy(sql);
+        int pos = sql.lastIndexOf(" order by ");
        if (pos != -1) {
          sql = sql.substring(0, pos);
        }
@@ -300,27 +300,6 @@ final class CQueryBuilder {
    return request.descriptor().includesAggregation(query.detail());
  }

-  /**
-   * Find the last " order by " that is not inside parentheses (i.e. not inside a subquery).
-   * Returns the position or -1 if not found.
-   */
-  static int lastTopLevelOrderBy(String sql) {
-    String target = " order by ";
-    int depth = 0;
-    int lastFound = -1;
-    for (int i = 0; i < sql.length(); i++) {
-      char c = sql.charAt(i);
-      if (c == '(') {
-        depth++;
-      } else if (c == ')') {
-        depth--;
-      } else if (depth == 0 && c == ' ' && sql.regionMatches(true, i, target, 0, target.length())) {
-        lastFound = i;
-      }
-    }
-    return lastFound;
-  }
-
  private String wrapSelectCount(String sql) {
    sql = "select count(*) from ( " + sql + ")";
    if (selectCountWithAlias) {
@@ -736,7 +715,7 @@ final class CQueryBuilder {
      appendHistoryAsOfPredicate();
      appendFindId();
      appendToWhere(predicates.dbWhere());
-      appendToWhere(predicates.dbFilterManyWhere());
+      appendToWhere(predicates.dbFilterMany());
      if (!query.isIncludeSoftDeletes()) {
        appendSoftDelete();
      }
@@ -39,7 +39,6 @@ public final class CQueryPredicates {
  private final Object idValue;
  private final BindParams bindParams;
  private DefaultExpressionRequest filterMany;
-  private boolean filterManyJoin;
  /**
   * Bind values from the where expressions.
   */
@@ -107,9 +106,6 @@ public final class CQueryPredicates {
        dataBind.append(", ");
      }
    }
-    if (filterManyJoin) {
-      filterMany.bind(dataBind);
-    }
    if (idValue != null) {
      // this is a find by id type query...
      request.descriptor().bindId(dataBind, idValue);
@@ -123,7 +119,7 @@ public final class CQueryPredicates {
    if (where != null) {
      where.bind(dataBind);
    }
-    if (!filterManyJoin && filterMany != null) {
+    if (filterMany != null) {
      filterMany.bind(dataBind);
    }
    if (having != null) {
@@ -193,10 +189,9 @@ public final class CQueryPredicates {
      if (chunk != null) {
        SpiExpressionList<?> filterManyExpr = chunk.getFilterMany();
        if (filterManyExpr != null) {
-          filterManyJoin = chunk.isFilterManyJoin();
-          filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr);
+          this.filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr);
          if (buildSql) {
-            dbFilterMany = filterMany.buildSql();
+            dbFilterMany = manyProperty.idNullOr(filterMany.buildSql());
          }
        }
      }
@@ -344,17 +339,10 @@ public final class CQueryPredicates {
  }

  /**
-   * Return a db filter to be included in the WHERE.
+   * Return a db filter for filtering many fetch joins.
   */
-  String dbFilterManyWhere() {
-    return filterManyJoin ? null : dbFilterMany;
-  }
-
-  /**
-   * Return a db filter to be included in the JOIN.
-   */
-  String dbFilterManyJoin() {
-    return filterManyJoin ? dbFilterMany : null;
+  String dbFilterMany() {
+    return dbFilterMany;
  }

  /**
@@ -15,8 +15,8 @@ final class DFetchGroup<T> implements SpiFetchGroup<T> {
  }

  @Override
-  public OrmQueryDetail detail(OrmQueryDetail existing) {
-    return detail.copy(existing);
+  public OrmQueryDetail detail() {
+    return detail.copy();
  }

  @Override
@@ -22,7 +22,6 @@ final class DefaultDbSqlContext implements DbSqlContext {
  private final ArrayStack<String> joinStack = new ArrayStack<>();
  private final ArrayStack<String> prefixStack = new ArrayStack<>();
  private final String fromForUpdate;
-  private final String dbFilterManyJoin;
  private boolean useColumnAlias;
  private int columnIndex;
  private int asOfTableCount;
@@ -42,7 +41,7 @@ final class DefaultDbSqlContext implements DbSqlContext {
  private boolean joinSuppressed;

  DefaultDbSqlContext(SqlTreeAlias alias, String columnAliasPrefix, CQueryHistorySupport historySupport,
-                      CQueryDraftSupport draftSupport, String fromForUpdate, String dbFilterManyJoin) {
+                      CQueryDraftSupport draftSupport, String fromForUpdate) {
    this.alias = alias;
    this.columnAliasPrefix = columnAliasPrefix;
    this.useColumnAlias = columnAliasPrefix != null;
@@ -50,14 +49,6 @@ final class DefaultDbSqlContext implements DbSqlContext {
    this.historySupport = historySupport;
    this.historyQuery = (historySupport != null);
    this.fromForUpdate = fromForUpdate;
-    this.dbFilterManyJoin = dbFilterManyJoin;
-  }
-
-  @Override
-  public void includeFilterMany() {
-    if (dbFilterManyJoin != null) {
-      sb.append(" and ").append(dbFilterManyJoin);
-    }
  }

  @Override
@@ -52,7 +52,7 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
  @SuppressWarnings("rawtypes")
  @Override
  public Query<T> select(FetchGroup fetchGroup) {
-    this.detail = ((SpiFetchGroup) fetchGroup).detail(detail);
+    this.detail = ((SpiFetchGroup) fetchGroup).detail();
    return this;
  }

@@ -235,7 +235,7 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
  }

  @Override
-  public Query<T> usingMaster(boolean useMaster) {
+  public Query<T> usingMaster() {
    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
  }

@@ -129,7 +129,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
      result = finder.postProcessMany(request, result);
    }

-    if (result != null && request.isBeanCachePut()) {
+    if (result != null && request.isBeanCachePutMany()) {
      // load the individual beans into the bean cache
      request.descriptor().cacheBeanPutAll(result.actualDetails());
    }
@@ -14,7 +14,6 @@ import io.ebeaninternal.server.core.RelationalQueryRequest;
 import io.ebeaninternal.server.core.RowReader;
 import io.ebeaninternal.server.persist.Binder;

-import jakarta.persistence.NonUniqueResultException;
 import jakarta.persistence.PersistenceException;

 import java.sql.SQLException;
@@ -116,14 +115,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
    try {
      request.executeSql(binder, SpiQuery.Type.BEAN);
      T value = request.mapOne(mapper);
-      if (request.next()) {
-        throw new NonUniqueResultException("Got more than 1 result for findOne");
-      }
      request.logSummary();
      return value;

-    } catch (NonUniqueResultException e) {
-      throw e;
    } catch (Exception e) {
      throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);

@@ -166,17 +160,13 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
      T value = null;
      if (dataReader.next()) {
        value = scalarType.read(dataReader);
-        if (dataReader.next()) {
-          throw new NonUniqueResultException("Got more than 1 result for findSingleAttribute");
-        }
      }
      request.logSummary();
      return value;

-    } catch (NonUniqueResultException e) {
-      throw e;
    } catch (Exception e) {
      throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
+
    } finally {
      request.close();
    }
@@ -107,7 +107,7 @@ public final class SqlTreeBuilder {
    CQueryHistorySupport historySupport = builder.historySupport(query);
    CQueryDraftSupport draftSupport = builder.draftSupport(query);
    String colAlias = subQuery || rootNode.isSingleProperty() ? null : columnAliasPrefix;
-    this.ctx = new DefaultDbSqlContext(alias, colAlias, historySupport, draftSupport, fromForUpdate, predicates.dbFilterManyJoin());
+    this.ctx = new DefaultDbSqlContext(alias, colAlias, historySupport, draftSupport, fromForUpdate);
  }

  /**
@@ -371,11 +371,10 @@ public final class SqlTreeBuilder {
    IncludesDistiller extraJoinDistill = new IncludesDistiller(desc, selectIncludes, predicateIncludes, manyWhereJoins, temporalMode);
    Collection<SqlTreeNodeExtraJoin> extraJoins = extraJoinDistill.getExtraJoinRootNodes();
    if (!extraJoins.isEmpty()) {
-      // add extra joins required to support predicates and/or order by clause
+      // add extra joins required to support predicates
+      // and/or order by clause
      for (SqlTreeNodeExtraJoin extraJoin : extraJoins) {
-        if (!addToParent(extraJoin, myList)) {
-          myList.add(extraJoin);
-        }
+        myList.add(extraJoin);
        if (extraJoin.isManyJoin()) {
          // as we are now going to join to the many then we need
          // to add the distinct to the sql query to stop duplicate
@@ -386,20 +385,6 @@ public final class SqlTreeBuilder {
    }
  }

-  /**
-   * Return true if the extra join was added as a child to one of the nodes.
-   */
-  private boolean addToParent(SqlTreeNodeExtraJoin extraJoin, List<SqlTreeNode> myList) {
-    String parentPath = SplitName.split(extraJoin.prefix())[0];
-    for (SqlTreeNode maybeParent : myList) {
-      if (maybeParent.prefix().equals(parentPath)) {
-        maybeParent.addChild(extraJoin);
-        return true;
-      }
-    }
-    return false;
-  }
-
  /**
   * A subQuery has slightly different rules in that it just generates SQL (into
   * the where clause) and its properties are not required to read the resultSet
@@ -656,7 +641,7 @@ public final class SqlTreeBuilder {
        SqlTreeNodeExtraJoin root = findExtraJoinRoot(includeProp, extraJoin);
        // register the root because these are the only ones we
        // return back.
-        rootRegister.put(root.prefix(), root);
+        rootRegister.put(root.name(), root);
      }
    }

@@ -84,12 +84,4 @@ interface SqlTreeNode {
   */
  default void unselectLobsForPlatform() {
  }
-
-  default String prefix() {
-    return ""; // not matched
-  }
-
-  default void addChild(SqlTreeNode extraJoin) {
-    throw new UnsupportedOperationException();
-  }
 }
@@ -99,16 +99,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
    this.pathMap = createPathMap(prefix, desc);
  }

-  @Override
-  public String prefix() {
-    return prefix;
-  }
-
-  @Override
-  public void addChild(SqlTreeNode extraJoin) {
-    children.add(extraJoin);
-  }
-
  @Override
  public SqlTreeLoad createLoad() {
    return new SqlTreeLoadBean(this);
@@ -87,8 +87,7 @@ final class SqlTreeNodeExtraJoin implements SqlTreeNode {
    return manyJoin;
  }

-  @Override
-  public String prefix() {
+  public String name() {
    return prefix;
  }

@@ -45,6 +45,5 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
  @Override
  public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
    super.appendFrom(ctx, joinType.autoToOuter());
-    ctx.includeFilterMany();
  }
 }
@@ -95,8 +95,8 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
  }

  @Override
-  public DtoQuery<T> usingMaster(boolean useMaster) {
-    this.useMaster = useMaster;
+  public DtoQuery<T> usingMaster() {
+    this.useMaster = true;
    return this;
  }

@@ -769,7 +769,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    copy.useQueryCache = useQueryCache;
    copy.unmodifiable = unmodifiable;
    if (detail != null) {
-      copy.detail = detail.copy(null);
+      copy.detail = detail.copy();
    }
    copy.temporalMode = temporalMode;
    copy.firstRow = firstRow;
@@ -1387,7 +1387,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
  @Override
  public final Query<T> select(FetchGroup<T> fetchGroup) {
    if (fetchGroup != null) {
-      this.detail = ((SpiFetchGroup<T>) fetchGroup).detail(detail);
+      this.detail = ((SpiFetchGroup<T>) fetchGroup).detail();
    }
    return this;
  }
@@ -1475,8 +1475,8 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
  }

  @Override
-  public Query<T> usingMaster(boolean useMaster) {
-    this.useMaster = useMaster;
+  public Query<T> usingMaster() {
+    this.useMaster = true;
    return this;
  }

@@ -60,8 +60,8 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
  }

  @Override
-  public SqlQuery usingMaster(boolean useMaster) {
-    this.useMaster = useMaster;
+  public SqlQuery usingMaster() {
+    this.useMaster = true;
    return this;
  }

@@ -39,21 +39,12 @@ public final class OrmQueryDetail implements Serializable {
  /**
   * Return a deep copy of the OrmQueryDetail.
   */
-  public OrmQueryDetail copy(OrmQueryDetail existing) {
+  public OrmQueryDetail copy() {
    OrmQueryDetail copy = new OrmQueryDetail();
    copy.baseProps = baseProps.copy();
    for (Map.Entry<String, OrmQueryProperties> entry : fetchPaths.entrySet()) {
      copy.fetchPaths.put(entry.getKey(), entry.getValue().copy());
    }
-    if (existing != null) {
-      // transfer any existing filterMany expressions
-      for (Map.Entry<String, OrmQueryProperties> entry : existing.fetchPaths.entrySet()) {
-        var filterMany = entry.getValue().getFilterMany();
-        if (filterMany != null) {
-          copy.getChunk(entry.getKey(), true).setFilterMany(filterMany);
-        }
-      }
-    }
    return copy;
  }

@@ -171,9 +171,8 @@ public final class OrmQueryProperties implements Serializable {
    if (filterMany == null) {
      FilterExprPath exprPath = new FilterExprPath(path);
      SpiExpressionFactory queryEf = (SpiExpressionFactory) rootQuery.getExpressionFactory();
-      ExpressionFactory filterEf = queryEf.createExpressionFactory();
+      ExpressionFactory filterEf = queryEf.createExpressionFactory();// exprPath);
      filterMany = new FilterExpressionList(exprPath, filterEf, rootQuery);
-      // assuming conditions supported in JOIN, not setting markForQueryJoin = true
    }
    return filterMany;
  }
@@ -188,13 +187,6 @@ public final class OrmQueryProperties implements Serializable {
    return filterMany.trimPath(trimPath);
  }

-  /**
-   * Return true if there is a filterMany and it should be included in the JOIN.
-   */
-  public boolean isFilterManyJoin() {
-    return filterMany != null && !markForQueryJoin;
-  }
-
  /**
   * Adjust filterMany expressions for inclusion in main query.
   */
@@ -10,7 +10,7 @@ public interface SpiFetchGroup<T> extends FetchGroup<T> {
  /**
   * Return the detail to use for query execution.
   */
-  OrmQueryDetail detail(OrmQueryDetail existing);
+  OrmQueryDetail detail();

  /**
   * Return the underlying detail for copy purposes.
@@ -20,7 +20,7 @@ public final class DocStoreTransactionManager extends TransactionManager {

  @Override
  public SpiTransaction createTransaction(boolean explicit, int isolationLevel) {
-    return new DocStoreOnlyTransaction(explicit, this);
+    return createTransaction(explicit, null);
  }

  @Override
@@ -28,4 +28,8 @@ public final class DocStoreTransactionManager extends TransactionManager {
    return new DocStoreOnlyTransaction(false, this);
  }

+  @Override
+  protected SpiTransaction createTransaction(boolean explicit, Connection c) {
+    return new DocStoreOnlyTransaction(explicit, this);
+  }
 }
@@ -150,6 +150,11 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    return false;
  }

+  @Override
+  public boolean isSkipCacheExplicit() {
+    return false;
+  }
+
  @Override
  public void setSkipCache(boolean skipCache) {
  }
@@ -195,7 +200,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
  }

  @Override
-  public void registerDeleteBean(Class<?> type, Object id) {
+  public void registerDeleteBean(Integer persistingBean) {
    throw new IllegalStateException(notExpectedMessage);
  }

@@ -203,7 +208,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
   * Return true if this is a bean that has already been saved/deleted.
   */
  @Override
-  public boolean isRegisteredDeleteBean(Class<?> type, Object id) {
+  public boolean isRegisteredDeleteBean(Integer persistingBean) {
    return false;
  }

@@ -1,32 +0,0 @@
-package io.ebeaninternal.server.transaction;
-
-import org.jspecify.annotations.Nullable;
-
-import java.sql.Connection;
-
-/**
- * Ebean transaction used for AutoCommit true connections.
- */
-final class JdbcAutoCommitTransaction extends JdbcTransaction {
-
-  JdbcAutoCommitTransaction(boolean explicit, Connection connection, @Nullable TransactionManager manager) {
-    super(true, explicit, connection, manager);
-  }
-
-  @Override
-  void performRollback() {
-    long offset = profileOffset();
-    if (profileStream != null) {
-      profileStream.addEvent(EVT_ROLLBACK, offset);
-    }
-  }
-
-  @Override
-  void performCommit() {
-    long offset = profileOffset();
-    if (profileStream != null) {
-      profileStream.addEvent(EVT_COMMIT, offset);
-    }
-  }
-
-}
@@ -68,7 +68,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
  private int depth;
  private boolean autoCommit;
  private IdentityHashMap<Object, Object> persistingBeans;
-  private Map<Class<?>, Set<Object>> deletingBeans;
+  private HashSet<Integer> deletingBeansHash;
  private HashMap<String, String> m2mIntersectionSave;
  private Map<String, Object> userObjects;
  private List<TransactionCallback> callbackList;
@@ -90,17 +90,13 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   */
  private final boolean skipCacheAfterWrite;
  DocStoreTransaction docStoreTxn;
-  protected ProfileStream profileStream;
+  private ProfileStream profileStream;
  private ProfileLocation profileLocation;
  private final Instant startTime = Instant.now();
  private final long startNanos;
  private boolean autoPersistUpdates;

  JdbcTransaction(boolean explicit, Connection connection, TransactionManager manager) {
-    this(false, explicit, connection, manager);
-  }
-
-  JdbcTransaction(boolean autoCommit, boolean explicit, Connection connection, TransactionManager manager) {
    try {
      this.active = true;
      this.explicit = explicit;
@@ -129,9 +125,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
        this.onQueryOnlyCommit = true;
      }

-      if (!autoCommit) {
-        checkAutoCommit(connection);
-      }
+      checkAutoCommit(connection);

    } catch (Exception e) {
      throw new PersistenceException(e);
@@ -209,6 +203,11 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    return autoPersistUpdates;
  }

+  @Override
+  public final boolean isSkipCacheExplicit() {
+    return (skipCache != null && !skipCache);
+  }
+
  @Override
  public final boolean isSkipCache() {
    if (skipCache != null) return skipCache;
@@ -329,28 +328,40 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    deferredList.add(derived);
  }

+  /**
+   * Add a bean to the registed list.
+   * <p>
+   * This is to handle bi-directional relationships where both sides Cascade.
+   * </p>
+   */
  @Override
-  public final void registerDeleteBean(Class<?> type, Object id) {
-    deleteBeanIds(type).add(id);
-  }
-
-  @Override
-  public final boolean isRegisteredDeleteBean(Class<?> type, Object id) {
-    return deleteBeanIds(type).contains(id);
-  }
-
-  private Set<Object> deleteBeanIds(Class<?> type) {
-    if (deletingBeans == null) {
-      deletingBeans = new HashMap<>();
+  public final void registerDeleteBean(Integer persistingBean) {
+    if (deletingBeansHash == null) {
+      deletingBeansHash = new HashSet<>();
    }
-    return deletingBeans.computeIfAbsent(type, k -> new HashSet<>());
+    deletingBeansHash.add(persistingBean);
  }

+  /**
+   * Return true if this is a bean that has already been saved/deleted.
+   */
+  @Override
+  public final boolean isRegisteredDeleteBean(Integer persistingBean) {
+    return deletingBeansHash != null && deletingBeansHash.contains(persistingBean);
+  }
+
+  /**
+   * Unregister the persisted beans (when persisting at the top level).
+   */
  @Override
  public final void unregisterBeans() {
    persistingBeans.clear();
  }

+  /**
+   * Return true if this is a bean that has already been saved. This will
+   * register the bean if it is not already.
+   */
  @Override
  public final boolean isRegisteredBean(Object bean) {
    if (persistingBeans == null) {
@@ -359,6 +370,10 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    return (persistingBeans.put(bean, PLACEHOLDER) != null);
  }

+  /**
+   * Return true if the m2m intersection save is allowed from a given bean direction.
+   * This is to stop m2m intersection management via both directions of a m2m.
+   */
  @Override
  public final boolean isSaveAssocManyIntersection(String intersectionTable, String beanName) {
    if (m2mIntersectionSave == null) {
@@ -154,12 +154,12 @@ final class NoTransaction implements SpiTransaction {
  }

  @Override
-  public void registerDeleteBean(Class<?> type, Object id) {
+  public void registerDeleteBean(Integer hash) {

  }

  @Override
-  public boolean isRegisteredDeleteBean(Class<?> type, Object id) {
+  public boolean isRegisteredDeleteBean(Integer hash) {
    return false;
  }

@@ -235,6 +235,11 @@ final class NoTransaction implements SpiTransaction {
  public void setSkipCache(boolean skipCache) {
  }

+  @Override
+  public boolean isSkipCacheExplicit() {
+    return false;
+  }
+
  @Override
  public boolean isSkipCache() {
    return false;
@@ -13,18 +13,9 @@ import java.sql.SQLException;
 abstract class TransactionFactory {

  final TransactionManager manager;
-  private final boolean autoCommitMode;

  TransactionFactory(TransactionManager manager) {
    this.manager = manager;
-    this.autoCommitMode = manager.isAutoCommitMode();
-  }
-
-  /**
-   * Return a new transaction.
-   */
-  SpiTransaction createTransaction(boolean explicit, Connection connection) {
-    return autoCommitMode ? new JdbcAutoCommitTransaction(explicit, connection, manager) : new JdbcTransaction(explicit, connection, manager);
  }

  /**
@@ -39,7 +39,7 @@ class TransactionFactoryBasic extends TransactionFactory {
    Connection connection = null;
    try {
      connection = dataSource.getConnection();
-      SpiTransaction t = createTransaction(explicit, connection);
+      SpiTransaction t = manager.createTransaction(explicit, connection);
      return setIsolationLevel(t, isolationLevel);
    } catch (PersistenceException ex) {
      JdbcClose.close(connection);
@@ -48,7 +48,7 @@ class TransactionFactoryTenant extends TransactionFactory {
    try {
      Object tenantId = tenantProvider.currentId();
      connection = dataSourceSupplier.connection(tenantId);
-      SpiTransaction transaction = createTransaction(explicit, connection);
+      SpiTransaction transaction = manager.createTransaction(explicit, connection);
      transaction.setTenantId(tenantId);
      return setIsolationLevel(transaction, isolationLevel);

@@ -5,12 +5,12 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.ProfileLocation;
 import io.ebean.TxScope;
 import io.ebean.annotation.PersistBatch;
-import io.ebean.annotation.Platform;
 import io.ebean.annotation.TxType;
 import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.datasource.DataSourcePool;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeSet;
@@ -106,7 +106,6 @@ public class TransactionManager implements SpiTransactionManager {
  private final ServerCacheNotify cacheNotify;
  private final boolean supportsSavepointId;
  private final ConcurrentHashMap<String, ProfileLocation> profileLocations = new ConcurrentHashMap<>();
-  private final boolean autoCommitMode;

  /**
   * Create the TransactionManager
@@ -116,7 +115,6 @@ public class TransactionManager implements SpiTransactionManager {
    this.logManager = options.logManager;
    this.databasePlatform = options.config.getDatabasePlatform();
    this.supportsSavepointId = databasePlatform.supportsSavepointId();
-    this.autoCommitMode = databasePlatform.platform() == Platform.CLICKHOUSE;
    this.skipCacheAfterWrite = options.config.isSkipCacheAfterWrite();
    this.notifyL2CacheInForeground = options.notifyL2CacheInForeground;
    this.autoPersistUpdates = options.config.isAutoPersistUpdates();
@@ -208,10 +206,6 @@ public class TransactionManager implements SpiTransactionManager {
    }
  }

-  final boolean isAutoCommitMode() {
-    return autoCommitMode;
-  }
-
  /**
   * Return true if the DB platform supports SavepointId().
   */
@@ -304,6 +298,13 @@ public class TransactionManager implements SpiTransactionManager {
    return transactionFactory.createReadOnlyTransaction(tenantId, useMaster);
  }

+  /**
+   * Create a new transaction.
+   */
+  SpiTransaction createTransaction(boolean explicit, Connection c) {
+    return new JdbcTransaction(explicit, c, this);
+  }
+
  /**
   * Process a local rolled back transaction.
   */
@@ -216,9 +216,6 @@ public final class DefaultTypeManager implements TypeManager {
      }
      found = checkInheritedTypes(type);
    }
-    if (found instanceof ScalarTypeClass) {
-      log.log(WARNING, "@Column mapping for type Class is deprecated. Please refer to https://ebean.io/docs/deprecated#class-mapping");
-    }
    return found != ScalarTypeNotFound.INSTANCE ? found : null; // Do not return ScalarTypeNotFound, otherwise checks will fail
  }

@@ -374,7 +371,7 @@ public final class DefaultTypeManager implements TypeManager {

  private ScalarType<?> createJsonObjectMapperType(DeployBeanProperty prop, int dbType, DocPropertyType docType) {
    if (jsonMapper == null) {
-      throw new IllegalArgumentException("Unsupported @DbJson mapping - Missing dependency ebean-jackson-mapper? Jackson ObjectMapper not present for " + prop);
+      throw new IllegalArgumentException("Unsupported @DbJson mapping - Jackson ObjectMapper not present for " + prop);
    }
    if (MutationDetection.DEFAULT == prop.getMutationDetection()) {
      prop.setMutationDetection(jsonManager.mutationDetection());
@@ -10,7 +10,7 @@ import jakarta.persistence.PersistenceException;
@SuppressWarnings({"rawtypes"})
 final class ScalarTypeClass extends ScalarTypeBaseVarchar<Class> {

-  ScalarTypeClass() {
+  public ScalarTypeClass() {
    super(Class.class);
  }

@@ -69,7 +69,7 @@ module io.ebean.core {
  exports io.ebeaninternal.server.querydefn to io.ebean.autotune, io.ebean.querybean, io.ebean.test, io.ebean.elastic;
  exports io.ebeaninternal.server.rawsql to io.ebean.test;
  exports io.ebeaninternal.server.json to io.ebean.test, io.ebean.elastic;
-  exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test, io.ebean.postgis.types, io.ebean.pgvector;
+  exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test, io.ebean.postgis.types;
  exports io.ebeaninternal.server.transaction to io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.k8scache;
  exports io.ebeaninternal.server.util to io.ebean.querybean;

@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;

-import io.ebean.config.AggregateFormulaContext;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;

@@ -8,10 +7,11 @@ import static org.assertj.core.api.Assertions.assertThat;

 public class FormulaPropertyPathTest extends BaseTest {

-  private final BeanDescriptor<Customer> customerDesc = getBeanDescriptor(Customer.class);
+  private BeanDescriptor<Customer> customerDesc = getBeanDescriptor(Customer.class);

  @Test
  public void isFormula() {
+
    assertFormula("max(version)", "max", "version");
    assertFormula("min(name)", "min", "name");
    assertFormula("avg(id)", "avg", "id");
@@ -58,8 +58,8 @@ public class FormulaPropertyPathTest extends BaseTest {
  }

  private void assertFormula(String input, String funcName, String expression, String cast, String alias) {
-    var context = AggregateFormulaContext.builder().build();
-    FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, context, input, null);
+
+    FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, input, null);

    assertThat(propertyPath.internalExpression()).isEqualTo(expression);
    assertThat(propertyPath.outerFunction()).isEqualTo(funcName);
--- a/Show More
+++ b/Show More