#3701 Improve error message when missing dependency ebean-jackson-mapper

Merge pull request #3704 from ebean-orm/feature/bump-test-deps-bytebuddy
Bump test dependencies byte buddy and assertj
2026-09-21 11:19:58 +00:00 · 2025-11-23 20:17:39 +13:00 · 2025-11-20 09:35:09 +13:00 · 2025-11-20 09:23:39 +13:00 · 2025-11-11 07:59:40 +13:00 · 2025-11-11 07:57:15 +13:00
181 changed files with 2609 additions and 576 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
+      run: mvn -T 8 clean test -Pdefault

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  </dependencies>
@@ -0,0 +1,85 @@
+<?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.1.1</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.1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>16.1.1</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.1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>16.1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-pgvector-types</artifactId>
+      <version>16.1.1</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>
@@ -0,0 +1,7 @@
+package io.ebean.pgvector.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+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.0.0-RC3</version>
+    <version>16.1.1</version>
    <relativePath>../..</relativePath>
  </parent>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  <artifactId>composites</artifactId>
@@ -25,6 +25,7 @@
    <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.0.0-RC3</version>
+    <version>16.1.1</version>
  </parent>

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

    <dependency>
@@ -989,6 +989,14 @@ 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>
@@ -2610,6 +2618,11 @@ public interface DatabaseBuilder {
     */
    NamingConvention getNamingConvention();

+    /**
+     * Return the AggregateFormulaContext.
+     */
+    AggregateFormulaContext aggregateFormulaContext();
+
    /**
     * Return true if all DB column and table names should use quoted identifiers.
     */
@@ -1,6 +1,7 @@
 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.
@@ -310,6 +311,7 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
  /**
   * Return the Id value.
   */
+  @Nullable
  Object getId();

  /**
@@ -446,11 +448,13 @@ 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();

  /**
@@ -393,6 +393,12 @@ 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);

@@ -441,6 +447,16 @@ 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);

@@ -0,0 +1,66 @@
+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();
+  }
+
+}
@@ -0,0 +1,61 @@
+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,6 +356,8 @@ 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.
   */
@@ -1279,6 +1281,17 @@ 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();
@@ -167,6 +167,7 @@ public class DatabasePlatform {
   * findIterate() and findVisit().
   */
  protected boolean forwardOnlyHintOnFindIterate;
+  protected boolean autoCommitFalseOnFindIterate;

  /**
   * If set then use the CONCUR_UPDATABLE hint when creating ResultSets.
@@ -528,6 +529,10 @@ public class DatabasePlatform {
    this.forwardOnlyHintOnFindIterate = forwardOnlyHintOnFindIterate;
  }

+  public boolean autoCommitFalseOnFindIterate() {
+    return autoCommitFalseOnFindIterate;
+  }
+
  /**
   * Return true if the ResultSet CONCUR_UPDATABLE Hint should be used on
   * createNativeSqlTree() PreparedStatements.
@@ -780,4 +785,5 @@ public class DatabasePlatform {
  public String inlineSqlHint(String hint) {
    return "/*+ " + hint + " */ ";
  }
+
 }
@@ -46,6 +46,11 @@ 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);
+
  private final Map<DbType, DbPlatformType> typeMap = new EnumMap<>(DbType.class);

  /**
@@ -93,6 +98,10 @@ 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,7 +51,12 @@ public enum DbType {
  JSONB(ExtraDbTypes.JSONB),
  JSONCLOB(ExtraDbTypes.JSONClob),
  JSONBLOB(ExtraDbTypes.JSONBlob),
-  JSONVARCHAR(ExtraDbTypes.JSONVarchar);
+  JSONVARCHAR(ExtraDbTypes.JSONVarchar),
+
+  VECTOR(ExtraDbTypes.VECTOR),
+  VECTOR_HALF(ExtraDbTypes.VECTOR_HALF),
+  VECTOR_BIT(ExtraDbTypes.VECTOR_BIT),
+  VECTOR_SPARSE(ExtraDbTypes.VECTOR_SPARSE);

  private final int id;

@@ -74,4 +74,24 @@ 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;
+
 }
@@ -0,0 +1,65 @@
+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.0.0-RC3</version>
+    <version>16.1.1</version>
  </parent>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    </dependencies>
@@ -0,0 +1,32 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.ebean</groupId>
+    <artifactId>ebean-parent</artifactId>
+    <version>16.1.1</version>
+  </parent>
+  <artifactId>ebean-core-json</artifactId>
+  <name>ebean-core-json</name>
+  <scm>
+    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>16.1.1</version>
+    </dependency>
+
+    <!-- Jackson core used internally by Ebean -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
+      <optional>true</optional>
+    </dependency>
+
+  </dependencies>
+
+</project>
@@ -8,11 +8,7 @@ import io.ebean.service.SpiJsonService;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;

 /**
 * Utility that converts between JSON content and simple java Maps/Lists.
@@ -52,8 +48,8 @@ public final class DJsonService implements SpiJsonService {
  }

  /**
-   * Parse the json and return as a Map additionally specifying if the returned map should
-   * be modify aware meaning that it can detect when it has been modified.
+   * Parse the json and return as a Map additionally specifying if the returned map should be modify
+   * aware meaning that it can detect when it has been modified.
   */
  @Override
  public Map<String, Object> parseObject(String json, boolean modifyAware) throws IOException {
@@ -94,9 +90,8 @@ public final class DJsonService implements SpiJsonService {

  /**
   * Parse the json and return as a Map taking a JsonParser and a starting token.
-   * <p>
-   * Used when the first token is checked to see if the value is null prior to calling this.
-   * </p>
+   *
+   * <p>Used when the first token is checked to see if the value is null prior to calling this.
   */
  @Override
  public Map<String, Object> parseObject(JsonParser parser, JsonToken token) throws IOException {
@@ -8,15 +8,23 @@ import io.ebean.ModifyAwareType;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
+import java.util.*;

 final class EJsonReader {

  static final JsonFactory json = new JsonFactory();
+  private final JsonParser parser;
+  private final boolean modifyAware;
+  private final ModifyAwareFlag modifyAwareOwner;
+  private int depth;
+  private Stack stack;
+  private Context currentContext;
+
+  EJsonReader(JsonParser parser, boolean modifyAware) {
+    this.parser = parser;
+    this.modifyAware = modifyAware;
+    this.modifyAwareOwner = modifyAware ? new ModifyAwareFlag() : null;
+  }

  @SuppressWarnings("unchecked")
  static Map<String, Object> parseObject(String json, boolean modifyAware) throws IOException {
@@ -102,24 +110,6 @@ final class EJsonReader {
    return new EJsonReader(parser, modifyAware).parseJson(token);
  }

-  private final JsonParser parser;
-
-  private final boolean modifyAware;
-
-  private final ModifyAwareFlag modifyAwareOwner;
-
-  private int depth;
-
-  private Stack stack;
-
-  private Context currentContext;
-
-  EJsonReader(JsonParser parser, boolean modifyAware) {
-    this.parser = parser;
-    this.modifyAware = modifyAware;
-    this.modifyAwareOwner = (modifyAware) ? new ModifyAwareFlag() : null;
-  }
-
  private void startArray() {
    depth++;
    stack.push(currentContext);
@@ -197,7 +187,6 @@ final class EJsonReader {
   */
  private void processJsonToken(JsonToken token) throws IOException {
    switch (token) {
-
      case START_ARRAY:
        startArray();
        break;
@@ -273,17 +262,17 @@ final class EJsonReader {
    }
  }

-  private static abstract class Context {
+  private abstract static class Context {
    Context next;

    abstract void popContext(Context temp);

    abstract Object getValue();

-    abstract void setKey(String key);
-
    abstract void setValue(Object value);

+    abstract void setKey(String key);
+
    abstract void setValueNull();
  }

@@ -312,13 +301,13 @@ final class EJsonReader {
    }

    @Override
-    void setKey(String key) {
-      this.key = key;
+    void setValue(Object value) {
+      map.put(key, value);
    }

    @Override
-    void setValue(Object value) {
-      map.put(key, value);
+    void setKey(String key) {
+      this.key = key;
    }

    @Override
@@ -364,5 +353,4 @@ final class EJsonReader {
      // not expected
    }
  }
-
 }
@@ -20,6 +20,11 @@ final class EJsonWriter {
   * Base jsonFactory implementation used when it is not passed in.
   */
  static final JsonFactory jsonFactory = new JsonFactory();
+  private final JsonGenerator jsonGenerator;
+
+  private EJsonWriter(JsonGenerator jsonGenerator) {
+    this.jsonGenerator = jsonGenerator;
+  }

  static String write(Object object) throws IOException {
    StringWriter writer = new StringWriter(200);
@@ -42,12 +47,6 @@ final class EJsonWriter {
    new EJsonWriter(jsonGenerator).writeCollection(null, collection);
  }

-  private final JsonGenerator jsonGenerator;
-
-  private EJsonWriter(JsonGenerator jsonGenerator) {
-    this.jsonGenerator = jsonGenerator;
-  }
-
  private void writeJson(Object object) {
    writeJson(null, object);
  }
@@ -210,5 +209,4 @@ final class EJsonWriter {
    }
    jsonGenerator.writeEndObject();
  }
-
 }
@@ -22,5 +22,4 @@ public final class ModifyAwareFlag implements ModifyAwareType, Serializable {
  public void setMarkedDirty(boolean markedDirty) {
    this.markedDirty = markedDirty;
  }
-
 }
@@ -14,9 +14,8 @@ public final class ModifyAwareIterator<E> implements Iterator<E> {

  /**
   * Create with an Owner and the underlying Iterator this wraps.
-   * <p>
-   * The owner is notified of the removals.
-   * </p>
+   *
+   * <p>The owner is notified of the removals.
   */
  public ModifyAwareIterator(ModifyAwareType owner, Iterator<E> it) {
    this.owner = owner;
@@ -38,5 +37,4 @@ public final class ModifyAwareIterator<E> implements Iterator<E> {
    owner.setMarkedDirty(true);
    it.remove();
  }
-
 }
@@ -34,11 +34,11 @@ public final class ModifyAwareMap<K, V> implements Map<K, V>, ModifyAwareType, S
  public boolean equals(Object o) {
    if (this == o) return true;
    if (o instanceof ModifyAwareMap) {
-      ModifyAwareMap<?,?> that = (ModifyAwareMap<?,?>) o;
+      ModifyAwareMap<?, ?> that = (ModifyAwareMap<?, ?>) o;
      return Objects.equals(map, that.map);
    }
    if (!(o instanceof Map)) return false;
-    Map<?,?> that = (Map<?,?>) o;
+    Map<?, ?> that = (Map<?, ?>) o;
    return Objects.equals(map, that);
  }

@@ -112,7 +112,6 @@ public final class ModifyAwareMap<K, V> implements Map<K, V>, ModifyAwareType, S
    map.putAll(m);
  }

-
  @Override
  public void clear() {
    if (!map.isEmpty()) {
@@ -135,5 +134,4 @@ public final class ModifyAwareMap<K, V> implements Map<K, V>, ModifyAwareType, S
  public Set<Map.Entry<K, V>> entrySet() {
    return new ModifyAwareSet<>(this, map.entrySet());
  }
-
 }
@@ -0,0 +1,9 @@
+module io.ebean.core.json {
+
+  requires io.ebean.api;
+
+  requires transitive com.fasterxml.jackson.core;
+  exports io.ebeaninternal.json to io.ebean.test, io.ebean.core;
+
+  provides io.ebean.service.BootstrapService with io.ebeaninternal.json.DJsonService;
+}
@@ -0,0 +1 @@
+io.ebeaninternal.json.DJsonService
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.0.0-RC3</version>
+    <version>16.1.1</version>
  </parent>

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

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

  <artifactId>ebean-core</artifactId>
@@ -22,7 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.0.0-RC3</version>
+      <version>16.1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core-json</artifactId>
+      <version>16.1.1</version>
    </dependency>

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

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

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

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

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

+import io.ebean.bean.EntityBean;
 import java.util.ArrayList;
 import java.util.List;

@@ -13,10 +14,23 @@ public final class BindValuesKey {

  private final List<Object> values = new ArrayList<>();

+  private final SpiEbeanServer server;
+
+  public BindValuesKey(SpiEbeanServer server) {
+    this.server = server;
+  }
+
  /**
   * Add a bind value.
   */
  public BindValuesKey add(Object value) {
+    if (value instanceof EntityBean) {
+      // only interested in id to keep the memory footprint low
+      Object id = server.beanId(value);
+      if (id != null) {
+        value = id;
+      }
+    }
    values.add(value);
    return this;
  }
@@ -31,5 +45,4 @@ public final class BindValuesKey {
    return values.hashCode();
  }

-
 }
@@ -0,0 +1,10 @@
+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);
+
+}
@@ -14,4 +14,9 @@ public interface SpiBeanType {
   * or removals from the collection.
   */
  boolean isToManyDirty(EntityBean bean);
+
+  /**
+   * Return the FormulaBuilder for this type.
+   */
+  FormulaBuilder formulaBuilder();
 }
@@ -1,5 +1,6 @@
 package io.ebeaninternal.api;

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

  @Nullable
  SqlRow findOne(SpiSqlQuery query);
+
+  <T> STreeProperty createFormulaProperty(SpiBeanType desc, String formula, String path);
 }
@@ -65,12 +65,12 @@ public interface SpiTransaction extends Transaction {
   * <p>
   * This is to handle bi-directional relationships where both sides Cascade.
   */
-  void registerDeleteBean(Integer hash);
+  void registerDeleteBean(Class<?> type, Object id);

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

  /**
   * Unregister the persisted beans. Expected after persisting top level beans
@@ -362,4 +362,14 @@ public interface SpiTransaction extends Transaction {
   * Set the transaction to be inactive via external transaction manager.
   */
  void deactivateExternal();
+
+  /**
+   * Set autocommit to false for a findIterate query.
+   * <p>
+   * This is done for specific platforms that need it, in order to make
+   * use cursors to stream a large or unbounded query result to the client.
+   */
+  default void setAutoCommitOnFindIterate() {
+    throw new UnsupportedOperationException();
+  }
 }
@@ -195,13 +195,13 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
  }

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

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

  @Override
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.core;

 import io.ebean.CancelableQuery;
-import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.persist.Binder;
@@ -98,6 +97,13 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery {
  public void setDefaultFetchBuffer(int fetchSize) {
    query.setDefaultFetchBuffer(fetchSize);
  }
+
+  public void setAutoCommitOnFindIterate() {
+    if (createdTransaction) {
+      transaction.setAutoCommitOnFindIterate();
+    }
+  }
+
  /**
   * Close the underlying resources.
   */
@@ -113,6 +113,7 @@ 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;

  /**
@@ -128,6 +129,7 @@ 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();
@@ -928,6 +930,11 @@ 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();
@@ -301,12 +301,12 @@ public final class InternalConfiguration {
  }

  DtoQueryEngine createDtoQueryEngine() {
-    return new DtoQueryEngine(binder, config.getJdbcFetchSizeFindEach(), config.getJdbcFetchSizeFindList());
+    return new DtoQueryEngine(binder, config.getJdbcFetchSizeFindEach(), config.getJdbcFetchSizeFindList(), databasePlatform.autoCommitFalseOnFindIterate());
  }

  RelationalQueryEngine createRelationalQueryEngine() {
    return new DefaultRelationalQueryEngine(binder, config.getDatabaseBooleanTrue(), config.getPlatformConfig().getDbUuid().useBinaryOptimized(),
-      config.getJdbcFetchSizeFindEach(), config.getJdbcFetchSizeFindList());
+      config.getJdbcFetchSizeFindEach(), config.getJdbcFetchSizeFindList(), databasePlatform.autoCommitFalseOnFindIterate());
  }

  OrmQueryEngine createOrmQueryEngine() {
@@ -786,4 +786,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
      beanDescriptor.freeze(bean);
    }
  }
+
+  public void setAutoCommitOnFindIterate() {
+    if (createdTransaction) {
+      transaction.setAutoCommitOnFindIterate();
+    }
+  }
 }
@@ -54,10 +54,6 @@ 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;
  /**
@@ -285,7 +281,9 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
  private void onFailedUpdateUndoGeneratedProperties() {
    for (BeanProperty prop : beanDescriptor.propertiesGenUpdate()) {
      Object oldVal = intercept.origValue(prop.propertyIndex());
-      prop.setValue(entityBean, oldVal);
+      if (oldVal != null) {
+        prop.setValue(entityBean, oldVal);
+      }
    }
  }

@@ -553,34 +551,17 @@ 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() {
-    Integer hash = beanHash();
-    transaction.registerDeleteBean(hash);
+    final Object id = beanDescriptor.id(entityBean);
+    transaction.registerDeleteBean(beanDescriptor.type(), id);
  }

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

@@ -809,7 +790,9 @@ 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) {
-        onFailedUpdateUndoGeneratedProperties();
+        if (type == Type.UPDATE) {
+          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,7 +2410,12 @@ 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) -> FormulaPropertyPath.create(this, formula, path));
+    return dynamicProperty.computeIfAbsent(key, (fullKey) -> ebeanServer.createFormulaProperty(this, formula, path));
+  }
+
+  @Override
+  public FormulaBuilder formulaBuilder() {
+    return new DFormulaBuilder(this);
  }

  /**
@@ -436,14 +436,15 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    }
    TableJoinColumn[] cols = join.columns();
    if (!idProp.isEmbedded()) {
-      // 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);
+      // 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);
+        }
      }
+      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;
@@ -128,16 +128,6 @@ 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 ";
@@ -0,0 +1,19 @@
+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);
+  }
+}
@@ -1,6 +1,7 @@
 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;

@@ -9,11 +10,10 @@ 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,12 +24,13 @@ final class FormulaPropertyPath {
  private String cast;
  private String alias;

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

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

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

  private String buildFormula(String parsed) {
@@ -804,11 +804,9 @@ 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,6 +617,8 @@ public class DeployBeanProperty {
    this.dbRead = true;
    this.dbInsertable = false;
    this.dbUpdateable = false;
+    // aggregation by default not fetchEager
+    this.fetchEager = false;
  }

  /**
@@ -726,7 +726,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   */
  @Override
  public <T> Junction<T> conjunction(Query<T> query) {
-    return new JunctionExpression<>(Junction.Type.AND, query, query.where());
+    return new JunctionExpression<>(Junction.Type.AND, query, this, query.where());
  }

  /**
@@ -734,7 +734,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   */
  @Override
  public <T> Junction<T> disjunction(Query<T> query) {
-    return new JunctionExpression<>(Junction.Type.OR, query, query.where());
+    return new JunctionExpression<>(Junction.Type.OR, query, this, query.where());
  }

  /**
@@ -742,7 +742,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   */
  @Override
  public <T> Junction<T> conjunction(Query<T> query, ExpressionList<T> parent) {
-    return new JunctionExpression<>(Junction.Type.AND, query, parent);
+    return new JunctionExpression<>(Junction.Type.AND, query, this, parent);
  }

  /**
@@ -750,14 +750,14 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   */
  @Override
  public <T> Junction<T> disjunction(Query<T> query, ExpressionList<T> parent) {
-    return new JunctionExpression<>(Junction.Type.OR, query, parent);
+    return new JunctionExpression<>(Junction.Type.OR, query, this, parent);
  }

  /**
   * Return a list of expressions that are wrapped by NOT.
   */
  public <T> Junction<T> junction(Junction.Type type, Query<T> query) {
-    return new JunctionExpression<>(type, query, query.where());
+    return new JunctionExpression<>(type, query, this, query.where());
  }

  /**
@@ -765,6 +765,6 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   */
  @Override
  public <T> Junction<T> junction(Junction.Type type, Query<T> query, ExpressionList<T> parent) {
-    return new JunctionExpression<>(type, query, parent);
+    return new JunctionExpression<>(type, query, this, parent);
  }
 }
@@ -40,12 +40,8 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
  /**
   * Construct for Text root expression list - this handles implicit Bool Should, Must etc.
   */
-  public DefaultExpressionList(Query<T> query) {
-    this(query, query.getExpressionFactory(), null, new ArrayList<>(), true);
-  }
-
-  public DefaultExpressionList(Query<T> query, ExpressionList<T> parentExprList) {
-    this(query, query.getExpressionFactory(), parentExprList, new ArrayList<>());
+  public DefaultExpressionList(Query<T> query, boolean textRoot) {
+    this(query, query.getExpressionFactory(), null, new ArrayList<>(), textRoot);
  }

  DefaultExpressionList(Query<T> query, ExpressionFactory expr, ExpressionList<T> parentExprList, List<SpiExpression> list) {
@@ -24,9 +24,9 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
  DefaultExpressionList<T> exprList;
  Junction.Type type;

-  JunctionExpression(Junction.Type type, Query<T> query, ExpressionList<T> parent) {
+  JunctionExpression(Junction.Type type, Query<T> query, ExpressionFactory expr, ExpressionList<T> parent) {
    this.type = type;
-    this.exprList = new DefaultExpressionList<>(query, parent);
+    this.exprList = new DefaultExpressionList<>(query, expr, parent, new ArrayList<>());
  }

  /**
@@ -329,6 +329,13 @@ 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;
@@ -37,12 +37,14 @@ public final class CQueryEngine {
  private final CQueryBuilder queryBuilder;
  private final CQueryHistorySupport historySupport;
  private final DatabasePlatform dbPlatform;
+  private final boolean autoCommitFalseOnFindIterate;

  public CQueryEngine(DatabaseBuilder.Settings config, DatabasePlatform dbPlatform, Binder binder, Map<String, String> asOfTableMapping, Map<String, String> draftTableMap) {
    this.dbPlatform = dbPlatform;
    this.defaultFetchSizeFindEach = config.getJdbcFetchSizeFindEach();
    this.defaultFetchSizeFindList = config.getJdbcFetchSizeFindList();
    this.forwardOnlyHintOnFindIterate = dbPlatform.forwardOnlyHintOnFindIterate();
+    this.autoCommitFalseOnFindIterate = dbPlatform.autoCommitFalseOnFindIterate();
    this.historySupport = new CQueryHistorySupport(dbPlatform.historySupport(), asOfTableMapping, config.getAsOfSysPeriod());
    this.queryBuilder = new CQueryBuilder(config, dbPlatform, binder, historySupport, new CQueryDraftSupport(draftTableMap));
  }
@@ -181,6 +183,9 @@ public final class CQueryEngine {
      if (defaultFetchSizeFindEach > 0) {
        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
      }
+      if (autoCommitFalseOnFindIterate) {
+        request.setAutoCommitOnFindIterate();
+      }
      if (!cquery.prepareBindExecuteQueryForwardOnly(forwardOnlyHintOnFindIterate)) {
        // query has been cancelled already
        return null;
@@ -15,8 +15,8 @@ final class DFetchGroup<T> implements SpiFetchGroup<T> {
  }

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

  @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();
+    this.detail = ((SpiFetchGroup) fetchGroup).detail(detail);
    return this;
  }

@@ -15,6 +15,8 @@ import io.ebeaninternal.server.core.RowReader;
 import io.ebeaninternal.server.persist.Binder;

 import jakarta.persistence.PersistenceException;
+
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
@@ -28,15 +30,18 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  private final Binder binder;
  private final String dbTrueValue;
  private final boolean binaryOptimizedUUID;
+  private final boolean autoCommitFalseOnFindIterate;
  private final TimedMetricMap timedMetricMap;
  private final int defaultFetchSizeFindEach;
  private final int defaultFetchSizeFindList;

  public DefaultRelationalQueryEngine(Binder binder, String dbTrueValue, boolean binaryOptimizedUUID,
-                                      int defaultFetchSizeFindEach, int defaultFetchSizeFindList) {
+                                      int defaultFetchSizeFindEach, int defaultFetchSizeFindList,
+                                      boolean autoCommitFalseOnFindIterate) {
    this.binder = binder;
    this.dbTrueValue = dbTrueValue == null ? "true" : dbTrueValue;
    this.binaryOptimizedUUID = binaryOptimizedUUID;
+    this.autoCommitFalseOnFindIterate = autoCommitFalseOnFindIterate;
    this.timedMetricMap = MetricFactory.get().createTimedMetricMap("sql.query.");
    this.defaultFetchSizeFindEach = defaultFetchSizeFindEach;
    this.defaultFetchSizeFindList = defaultFetchSizeFindList;
@@ -61,13 +66,20 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
    return "Query threw SQLException:" + msg + " Query was:" + sql;
  }

+  private <T> void prepareForIterate(RelationalQueryRequest request) throws SQLException {
+    if (defaultFetchSizeFindEach > 0) {
+      request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+    }
+    if (autoCommitFalseOnFindIterate) {
+      request.setAutoCommitOnFindIterate();
+    }
+    request.executeSql(binder, SpiQuery.Type.ITERATE);
+  }
+
  @Override
  public void findEach(RelationalQueryRequest request, RowConsumer consumer) {
    try {
-      if (defaultFetchSizeFindEach > 0) {
-        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
-      }
-      request.executeSql(binder, SpiQuery.Type.ITERATE);
+      prepareForIterate(request);
      request.mapEach(consumer);
      request.logSummary();

@@ -82,10 +94,7 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
  @Override
  public <T> void findEach(RelationalQueryRequest request, RowReader<T> reader, Predicate<T> consumer) {
    try {
-      if (defaultFetchSizeFindEach > 0) {
-        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
-      }
-      request.executeSql(binder, SpiQuery.Type.ITERATE);
+      prepareForIterate(request);
      while (request.next()) {
        if (!consumer.test(reader.read())) {
          break;
@@ -17,11 +17,13 @@ public final class DtoQueryEngine {
  private final Binder binder;
  private final int defaultFetchSizeFindEach;
  private final int defaultFetchSizeFindList;
+  private final boolean autoCommitFalseOnFindIterate;

-  public DtoQueryEngine(Binder binder, int defaultFetchSizeFindEach, int defaultFetchSizeFindList) {
+  public DtoQueryEngine(Binder binder, int defaultFetchSizeFindEach, int defaultFetchSizeFindList, boolean autoCommitFalseOnFindIterate) {
    this.binder = binder;
    this.defaultFetchSizeFindEach = defaultFetchSizeFindEach;
    this.defaultFetchSizeFindList = defaultFetchSizeFindList;
+    this.autoCommitFalseOnFindIterate = autoCommitFalseOnFindIterate;
  }

  public <T> List<T> findList(DtoQueryRequest<T> request) {
@@ -43,12 +45,19 @@ public final class DtoQueryEngine {
    }
  }

+  private <T> void prepareForIterate(DtoQueryRequest<T> request) throws SQLException {
+    if (defaultFetchSizeFindEach > 0) {
+      request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
+    }
+    if (autoCommitFalseOnFindIterate) {
+      request.setAutoCommitOnFindIterate();
+    }
+    request.executeSql(binder, SpiQuery.Type.ITERATE);
+  }
+
  public <T> QueryIterator<T> findIterate(DtoQueryRequest<T> request) {
    try {
-      if (defaultFetchSizeFindEach > 0) {
-        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
-      }
-      request.executeSql(binder, SpiQuery.Type.ITERATE);
+      prepareForIterate(request);
      return new DtoQueryIterator<>(request);
    } catch (SQLException e) {
      throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
@@ -57,10 +66,7 @@ public final class DtoQueryEngine {

  public <T> void findEach(DtoQueryRequest<T> request, Consumer<T> consumer) {
    try {
-      if (defaultFetchSizeFindEach > 0) {
-        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
-      }
-      request.executeSql(binder, SpiQuery.Type.ITERATE);
+      prepareForIterate(request);
      while (request.next()) {
        consumer.accept(request.readNextBean());
      }
@@ -73,11 +79,8 @@ public final class DtoQueryEngine {

  public <T> void findEach(DtoQueryRequest<T> request, int batchSize, Consumer<List<T>> consumer) {
    try {
+      prepareForIterate(request);
      List<T> buffer = new ArrayList<>();
-      if (defaultFetchSizeFindEach > 0) {
-        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
-      }
-      request.executeSql(binder, SpiQuery.Type.ITERATE);
      while (request.next()) {
        buffer.add(request.readNextBean());
        if (buffer.size() >= batchSize) {
@@ -98,10 +101,7 @@ public final class DtoQueryEngine {

  public <T> void findEachWhile(DtoQueryRequest<T> request, Predicate<T> consumer) {
    try {
-      if (defaultFetchSizeFindEach > 0) {
-        request.setDefaultFetchBuffer(defaultFetchSizeFindEach);
-      }
-      request.executeSql(binder, SpiQuery.Type.ITERATE);
+      prepareForIterate(request);
      while (request.next()) {
        if (!consumer.test(request.readNextBean())) {
          break;
@@ -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();
+      copy.detail = detail.copy(null);
    }
    copy.temporalMode = temporalMode;
    copy.firstRow = firstRow;
@@ -1244,7 +1244,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
  public final HashQuery queryHash() {
    // calculateQueryPlanHash is called just after potential AutoTune tuning
    // so queryPlanHash is calculated well before this method is called
-    BindValuesKey bindKey = new BindValuesKey();
+    BindValuesKey bindKey = new BindValuesKey(server);
    queryBindKey(bindKey);
    return new HashQuery(queryPlanKey, bindKey);
  }
@@ -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();
+      this.detail = ((SpiFetchGroup<T>) fetchGroup).detail(detail);
    }
    return this;
  }
@@ -1895,7 +1895,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
  public final ExpressionList<T> text() {
    if (textExpressions == null) {
      useDocStore = true;
-      textExpressions = new DefaultExpressionList<>(this);
+      textExpressions = new DefaultExpressionList<>(this, true);
    }
    return textExpressions;
  }
@@ -1903,7 +1903,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
  @Override
  public final ExpressionList<T> where() {
    if (whereExpressions == null) {
-      whereExpressions = new DefaultExpressionList<>(this, null);
+      whereExpressions = new DefaultExpressionList<>(this, false);
    }
    return whereExpressions;
  }
@@ -1924,7 +1924,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
  @Override
  public final ExpressionList<T> having() {
    if (havingExpressions == null) {
-      havingExpressions = new DefaultExpressionList<>(this, null);
+      havingExpressions = new DefaultExpressionList<>(this, false);
    }
    return havingExpressions;
  }
@@ -39,12 +39,21 @@ public final class OrmQueryDetail implements Serializable {
  /**
   * Return a deep copy of the OrmQueryDetail.
   */
-  public OrmQueryDetail copy() {
+  public OrmQueryDetail copy(OrmQueryDetail existing) {
    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;
  }

@@ -10,7 +10,7 @@ public interface SpiFetchGroup<T> extends FetchGroup<T> {
  /**
   * Return the detail to use for query execution.
   */
-  OrmQueryDetail detail();
+  OrmQueryDetail detail(OrmQueryDetail existing);

  /**
   * 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 createTransaction(explicit, null);
+    return new DocStoreOnlyTransaction(explicit, this);
  }

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

-  @Override
-  protected SpiTransaction createTransaction(boolean explicit, Connection c) {
-    return new DocStoreOnlyTransaction(explicit, this);
-  }
 }
@@ -36,7 +36,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
  /**
   * Set false when using autoCommit (as a performance optimisation for the read-only case).
   */
-  private final boolean useCommit;
+  private boolean useCommit;
  private final TransactionManager manager;
  private final SpiTxnLogger logger;
  private final boolean logSql;
@@ -200,7 +200,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
  }

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

@@ -208,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(Integer persistingBean) {
+  public boolean isRegisteredDeleteBean(Class<?> type, Object id) {
    return false;
  }

@@ -550,6 +550,16 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    throw new IllegalStateException(notExpectedMessage);
  }

+  @Override
+  public void setAutoCommitOnFindIterate() {
+    try {
+      connection.setAutoCommit(false);
+      useCommit = true;
+    } catch (SQLException e) {
+      throw new PersistenceException(e);
+    }
+  }
+
  @Override
  public void rollbackAndContinue() {
    // do nothing
@@ -0,0 +1,32 @@
+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 HashSet<Integer> deletingBeansHash;
+  private Map<Class<?>, Set<Object>> deletingBeans;
  private HashMap<String, String> m2mIntersectionSave;
  private Map<String, Object> userObjects;
  private List<TransactionCallback> callbackList;
@@ -90,13 +90,17 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   */
  private final boolean skipCacheAfterWrite;
  DocStoreTransaction docStoreTxn;
-  private ProfileStream profileStream;
+  protected 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;
@@ -125,7 +129,9 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
        this.onQueryOnlyCommit = true;
      }

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

    } catch (Exception e) {
      throw new PersistenceException(e);
@@ -328,40 +334,28 @@ 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(Integer persistingBean) {
-    if (deletingBeansHash == null) {
-      deletingBeansHash = new HashSet<>();
+  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<>();
    }
-    deletingBeansHash.add(persistingBean);
+    return deletingBeans.computeIfAbsent(type, k -> new HashSet<>());
  }

-  /**
-   * 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) {
@@ -370,10 +364,6 @@ 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(Integer hash) {
+  public void registerDeleteBean(Class<?> type, Object id) {

  }

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

@@ -13,9 +13,18 @@ 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);
  }

  /**
@@ -34,7 +43,7 @@ abstract class TransactionFactory {
  /**
   * Set the Transaction Isolation level if required.
   */
-  final SpiTransaction setIsolationLevel(SpiTransaction t, boolean explicit, int isolationLevel) {
+  final SpiTransaction setIsolationLevel(SpiTransaction t, int isolationLevel) {
    if (isolationLevel > -1) {
      Connection connection = t.internalConnection();
      try {
@@ -39,8 +39,8 @@ class TransactionFactoryBasic extends TransactionFactory {
    Connection connection = null;
    try {
      connection = dataSource.getConnection();
-      SpiTransaction t = create(explicit, connection);
-      return setIsolationLevel(t, explicit, isolationLevel);
+      SpiTransaction t = createTransaction(explicit, connection);
+      return setIsolationLevel(t, isolationLevel);
    } catch (PersistenceException ex) {
      JdbcClose.close(connection);
      throw ex;
@@ -49,8 +49,4 @@ class TransactionFactoryBasic extends TransactionFactory {
    }
  }

-  private SpiTransaction create(boolean explicit, Connection c) {
-    return manager.createTransaction(explicit, c);
-  }
-
 }
@@ -25,26 +25,32 @@ class TransactionFactoryTenant extends TransactionFactory {

  @Override
  public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) {
-    return create(false, tenantId);
+    Connection connection = null;
+    try {
+      if (tenantId == null) {
+        tenantId = tenantProvider.currentId();
+      }
+      connection = dataSourceSupplier.readOnlyConnection(tenantId, useMaster);
+      return new ImplicitReadOnlyTransaction(manager, connection, tenantId);
+
+    } catch (PersistenceException ex) {
+      JdbcClose.close(connection);
+      throw ex;
+
+    } catch (SQLException ex) {
+      throw new PersistenceException(ex);
+    }
  }

  @Override
  public final SpiTransaction createTransaction(boolean explicit, int isolationLevel) {
-    SpiTransaction t = create(explicit, null);
-    return setIsolationLevel(t, explicit, isolationLevel);
-  }
-
-  private SpiTransaction create(boolean explicit, Object tenantId) {
    Connection connection = null;
    try {
-      if (tenantId == null) {
-        // tenantId not set (by lazy loading) so get current tenantId
-        tenantId = tenantProvider.currentId();
-      }
+      Object tenantId = tenantProvider.currentId();
      connection = dataSourceSupplier.connection(tenantId);
-      SpiTransaction transaction = manager.createTransaction(explicit, connection);
+      SpiTransaction transaction = createTransaction(explicit, connection);
      transaction.setTenantId(tenantId);
-      return transaction;
+      return setIsolationLevel(transaction, isolationLevel);

    } catch (PersistenceException ex) {
      JdbcClose.close(connection);
@@ -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,6 +106,7 @@ 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
@@ -115,6 +116,7 @@ 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();
@@ -206,6 +208,10 @@ public class TransactionManager implements SpiTransactionManager {
    }
  }

+  final boolean isAutoCommitMode() {
+    return autoCommitMode;
+  }
+
  /**
   * Return true if the DB platform supports SavepointId().
   */
@@ -298,13 +304,6 @@ 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,6 +216,9 @@ 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
  }

@@ -371,7 +374,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 - Jackson ObjectMapper not present for " + prop);
+      throw new IllegalArgumentException("Unsupported @DbJson mapping - Missing dependency ebean-jackson-mapper? 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> {

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

@@ -31,6 +31,7 @@ module io.ebean.core {
  requires io.ebean.types;

  requires static io.avaje.jsr305x;
+  requires static io.ebean.core.json;
  requires static com.fasterxml.jackson.annotation;
  requires static com.fasterxml.jackson.core;
  requires static com.fasterxml.jackson.databind;
@@ -49,7 +50,6 @@ module io.ebean.core {

  exports io.ebeaninternal.api to io.ebean.ddl.generator, io.ebean.querybean, io.ebean.autotune, io.ebean.postgis, io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.postgis.types;
  exports io.ebeaninternal.api.json to io.ebean.test;
-  exports io.ebeaninternal.json to io.ebean.test;
  exports io.ebeaninternal.server.autotune to io.ebean.autotune;
  exports io.ebeaninternal.server.core to io.ebean.test, io.ebean.elastic;
  exports io.ebeaninternal.server.core.bootup to io.ebean.test;
@@ -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;
+  exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test, io.ebean.postgis.types, io.ebean.pgvector;
  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;

@@ -78,7 +78,6 @@ module io.ebean.core {
    io.ebeaninternal.server.query.DFetchGroupService,
    io.ebeaninternal.server.profile.DProfileLocationFactory,
    io.ebeaninternal.server.rawsql.DRawSqlService,
-    io.ebeaninternal.server.profile.DMetricFactory,
-    io.ebeaninternal.json.DJsonService;
+    io.ebeaninternal.server.profile.DMetricFactory;

 }
@@ -3,4 +3,3 @@ io.ebeaninternal.server.rawsql.DRawSqlService
 io.ebeaninternal.server.query.DFetchGroupService
 io.ebeaninternal.server.profile.DProfileLocationFactory
 io.ebeaninternal.server.profile.DMetricFactory
-io.ebeaninternal.json.DJsonService
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.deploy;

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

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

 public class FormulaPropertyPathTest extends BaseTest {

-  private BeanDescriptor<Customer> customerDesc = getBeanDescriptor(Customer.class);
+  private final 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) {
-
-    FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, input, null);
+    var context = AggregateFormulaContext.builder().build();
+    FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, context, input, null);

    assertThat(propertyPath.internalExpression()).isEqualTo(expression);
    assertThat(propertyPath.outerFunction()).isEqualTo(funcName);
@@ -70,7 +70,7 @@ public class RawExpressionTest extends BaseExpressionTest {
  }

  private BindValuesKey bindKey(RawExpression query) {
-    BindValuesKey bindValuesKey = new BindValuesKey();
+    BindValuesKey bindValuesKey = new BindValuesKey(spiEbeanServer());
    query.queryBindKey(bindValuesKey);
    return bindValuesKey;
  }
@@ -1,19 +1,20 @@
 package io.ebeaninternal.server.querydefn;

 import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.server.deploy.BaseTest;
 import org.junit.jupiter.api.Test;

 import static org.assertj.core.api.Assertions.assertThat;

-public class BindValuesKeyTest {
+public class BindValuesKeyTest extends BaseTest {

  @Test
  public void update_with_null() {

-    BindValuesKey hash = new BindValuesKey();
+    BindValuesKey hash = new BindValuesKey(spiEbeanServer());
    hash.add(1).add(null).add("hello");

-    BindValuesKey hash2 = new BindValuesKey();
+    BindValuesKey hash2 = new BindValuesKey(spiEbeanServer());
    hash2.add(1).add(null).add("hello");

    assertThat(hash).isEqualTo(hash2);
@@ -22,13 +23,13 @@ public class BindValuesKeyTest {
  @Test
  public void notEqual() {

-    BindValuesKey hash = new BindValuesKey();
+    BindValuesKey hash = new BindValuesKey(spiEbeanServer());
    hash.add(1).add(null).add("hello");

-    BindValuesKey hash2 = new BindValuesKey();
+    BindValuesKey hash2 = new BindValuesKey(spiEbeanServer());
    hash2.add(1).add("hello");

-    BindValuesKey hash3 = new BindValuesKey();
+    BindValuesKey hash3 = new BindValuesKey(spiEbeanServer());
    hash2.add(1).add(null);

    assertThat(hash).isNotEqualTo(hash2);
@@ -139,7 +139,7 @@ public class DefaultOrmQueryTest extends BaseExpressionTest {
  }

  private BindValuesKey bindKey(DefaultOrmQuery<Order> query) {
-    BindValuesKey key = new BindValuesKey();
+    BindValuesKey key = new BindValuesKey(spiEbeanServer());
    query.queryBindKey(key);
    return key;
  }
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.0.0-RC3</version>
+    <version>16.1.1</version>
  </parent>

  <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>16.0.0-RC3</version>
+      <version>16.1.1</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.0.0-RC3</version>
+      <version>16.1.1</version>
      <scope>provided</scope>
    </dependency>

@@ -65,7 +65,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>16.0.0-RC3</version>
+      <version>16.1.1</version>
      <scope>test</scope>
    </dependency>

@@ -195,7 +195,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
      String dbCol = column.getLocalDbColumn();
      BeanProperty importedProperty = p.findMatchImport(dbCol);
      if (importedProperty == null) {
-        throw new RuntimeException("Imported BeanProperty not found?");
+        continue;
      }
      String columnDefn = ctx.getColumnDefn(importedProperty, true);
      String refColumn = importedProperty.dbColumn();
@@ -3,18 +3,19 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.0.0-RC3</version>
+    <version>16.1.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

  <artifactId>ebean-jackson-mapper</artifactId>
+  <name>ebean-jackson-mapper</name>

  <dependencies>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>16.0.0-RC3</version>
+      <version>16.1.1</version>
      <scope>provided</scope>
    </dependency>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	d2a74ba6d1	#3701 Improve error message when missing dependency ebean-jackson-mapper	2025-11-23 20:17:39 +13:00
Rob Bygrave	f7b4edb193	Merge pull request #3704 from ebean-orm/feature/bump-test-deps-bytebuddy Bump test dependencies byte buddy and assertj	2025-11-20 09:35:09 +13:00
robin.bygrave	284c8d4d21	Bump test dependencies byte buddy and assertj	2025-11-20 09:23:39 +13:00
Rob Bygrave	59a5c5f9bd	Bump dependency avaje-config to 4.2 (#3699 )	2025-11-11 07:59:40 +13:00
Rob Bygrave	5b04d6eca3	#3551 Log warning for use of mapping column to Class (#3698 ) I think it was a mistake for Ebean to support Class<?> from a security perspective. Instead, Ebean should just use a String <-> Varchar and leave if up to the application to take that String and convert it to a class [and then that potential Class initialisation is owned by the application code and all security considerations around that are owned by the application code].	2025-11-11 07:57:15 +13:00
Ryszard TrojnackiandRob Bygrave	d5547808a2	PGvector support (#3696 ) * Add pgvector-types module. * Add missing binder definitions. Add missing PGbit type registration. Few tests. * Add cached bean test. * Prefer final classes, minor formating only --------- Co-authored-by: Rob Bygrave <robin.bygrave@gmail.com>	2025-11-09 16:55:51 +13:00
Rob Bygrave	5606c95de5	Version 16.1.1	2025-10-22 22:45:21 +13:00
Rob Bygrave	4c2bd408b0	Bump ebean-agent	2025-10-22 22:42:00 +13:00
Rob Bygrave	db76d5c27c	Test only - add Postgres JSONB raw() expression example	2025-10-22 22:03:09 +13:00
Rob Bygrave	f92c2f8c14	Test only - add test for string id InsertOnConflict	2025-10-22 22:02:40 +13:00
Rob Bygrave	51c3065419	3683 - Add AggregateFormulaContext to support group_concat etc (#3691 ) - Add AggregateFormulaContext with ability to override the default via DatabaseBuilder - Add group_concat, string_agg, listagg to set of known aggregation functions	2025-10-21 22:54:55 +13:00
Rob Bygrave	e46dd66292	Test only - bump to Postgres 17 for PostgresReadOnlyDatabaseTest	2025-10-21 20:55:52 +13:00
Rob Bygrave	3e1451bee7	Merge branch 'master' of github.com:ebean-orm/ebean	2025-10-21 20:54:23 +13:00
Rob Bygrave	4ac3c4ddb1	3682 @Aggregation is applied to query if entity also has a @lob column (#3689 ) * Version 16.1.0 * #3682 @Aggregation is applied to query if entity also has a @Lob column The underling issue was that Aggregation columns should have been marked as default LAZY. This impact was only hit when @Lob column are included which by default lazy fetched, and that means the default select clause determined.	2025-10-20 20:55:18 +13:00
Rob Bygrave	ee8e48902b	Merge branch 'master' of github.com:ebean-orm/ebean	2025-10-19 18:07:18 +13:00
Rob Bygrave	c37e752ace	#3681 javadoc query cache (#3687 ) * Version 16.1.0 * Improve javadoc for Query setUseQueryCache() and unmodifiable Since 16.x a query using the query cache returns unmodifiable object graphs.	2025-10-14 20:04:38 +13:00
Rob Bygrave	c9a6f822ac	Version 16.1.0	2025-09-19 18:48:28 +12:00
Rob Bygrave	2231ef9fd1	Bump ebean-agent to 16.1.0 with Java 25 support (#3680 ) Note that the IntelliJ plugin has been updated and published. It should be public in a few days.	2025-09-19 16:25:24 +12:00
Rob Bygrave	3ff1905318	Bump ebean-test-containers to 7.15 with updated ClickHouse support	2025-09-19 16:25:00 +12:00
Rob Bygrave	9b4fecff96	Add support for AutoCommit true transactions (#3679 ) * Add support for AutoCommit true transactions * Update DocStoreTransactionManager	2025-09-19 16:22:59 +12:00
Rob Bygrave	6f356fd55e	#3674 Add @Nullable to Query getId(), getForUpdateLockWait(), getForUpdateLockType() (#3675 ) These methods return nullable results, add JSpecify `@Nullable` to correctly indicate this.	2025-09-06 17:22:13 +12:00
Rob Bygrave	591f260f5b	Retain filterMany expression when select fetchGroup applied after filterMany (#3673 )	2025-09-02 22:35:43 +12:00
Rob Bygrave	b361b10571	Version 16.0.1	2025-09-02 14:09:03 +12:00
Rob Bygrave	c0e4e548ee	Update the kotlin-maven-plugin for tests and use EA maven profile (#3671 ) * Update the kotlin-maven-plugin for tests * Add a profile for EA that excludes kotlin-querybean-generator * For build workflow use maven profile "default" To ensure the kotlin-querybean-generator, test modules run * For build workflow use maven profile "default" To ensure the kotlin-querybean-generator, test modules run	2025-09-02 14:04:59 +12:00
Rob Bygrave	92f3245919	Bump ebean-agent to 16.0.1	2025-09-02 13:37:45 +12:00
Rob Bygrave	59c2290916	Bump ebean-migration dependency, fix for setting dbSchema on migrations (#3670 ) Ref: https://github.com/ebean-orm/ebean-migration/pull/163	2025-09-02 12:52:41 +12:00
Rob Bygrave	1135eb3f99	#3665 Fix for delete() Skips Bean due to Hash Collision (#3669 ) Change the underlying storage of deleting beans to be by type by id so: private Map<Class<?>, Set<Object>> deletingBeans;	2025-08-31 22:32:27 +12:00
Rob Bygrave	1dccdff7bf	#3664 Fix / support for extra JoinColumns on ManyToOne (#3668 ) * #3664 Fix / support for extra JoinColumns on ManyToOne Allows for extra JoinColumns on ManyToOne. The extra JoinColumn(s) are expected to be useful for the case of table partitioning where the extra join column is used to partition the table. In the test case, the partition column would be the org_id column and common to both tables (same partition key). * #3664 Fix / support for extra JoinColumns on ManyToOne Allows for extra JoinColumns on ManyToOne. The extra JoinColumn(s) are expected to be useful for the case of table partitioning where the extra join column is used to partition the table. In the test case, the partition column would be the org_id column and common to both tables (same partition key). * #3664 Extend test * #3664 Tidy up test	2025-08-31 12:52:17 +12:00
Rob Bygrave	5f74a53e3e	#3666 Fix for NPE with filterMany() containing or() (#3667 ) 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).	2025-08-31 10:08:07 +12:00
Rob Bygrave	1f9e652ea9	Version 16.0.0	2025-08-25 08:21:49 +12:00
Rob Bygrave	4e592c97ff	Update how to deploy	2025-08-05 23:30:18 +12:00
Rob Bygrave	760d19a10d	Update how to deploy	2025-08-05 23:16:42 +12:00
Rob Bygrave	d2693c3ff2	Version 16.0.0-RC4	2025-08-05 23:15:20 +12:00
Rob Bygrave	3324b2bda4	Use autocommit false with findIterate for Postgres (#3662 ) * Use autocommit false with findIterate for Postgres * Use autocommit false with findIterate for Postgres * Use autocommit false with FindDto queries for Postgres * Use autocommit false with SqlQuery findIterate queries for Postgres * Ensure that TransactionFactory.createReadOnlyTransaction() returns an ImplicitReadOnlyTransaction This change changes TransactionFactoryTenant.createReadOnlyTransaction() to return a ImplicitReadOnlyTransaction, as that is now used to support Postgres use of cursors with findIterate style queries.	2025-08-05 23:03:28 +12:00
Rob Bygrave	1b5e066562	#3654 Fix querybean-generator compiler warning for unclaimed annotations (#3655 ) warning: No processor claimed any of these annotations: /io.ebean.typequery.TypeQueryBean,/io.ebean.typequery.Generated This fix is required when the compiler is run with -Werror specified An alternative workaround is to use compiler arg -Xlint:-processing rather than -Xlint:all	2025-07-16 20:34:56 +12:00
Rob Bygrave	104e4ec756	Bump ebean-test-containers to 7.14 - Yugabyte read committed support enabled by default (#3651 )	2025-07-14 09:03:39 +12:00
Rob Bygrave	74a2967a6e	Tests Yugabyte - comment out the TestQueryForUpdate using repeatable read ... as its noise there is anyone else reads the logs	2025-07-12 09:38:06 +12:00
Rob Bygrave	e693b12a97	Tests DB2 - ignore TestRawExpressionInterpolation for DB2	2025-07-12 09:30:16 +12:00
Rob Bygrave	48fb9b34bb	Tests Yugabyte - faster test using forUpdate	2025-07-12 09:18:01 +12:00
Rob Bygrave	f64400400a	Tests Oracle - ignore the TestRawExpressionInterpolation for Oracle	2025-07-12 09:09:34 +12:00
Rob Bygrave	d7cc081942	Tests Yugabyte - see if everything else passes	2025-07-12 09:04:02 +12:00
Rob Bygrave	3351548b60	Fix use of JSpecify Nullable annotation in query bean generation	2025-07-11 23:45:31 +12:00
Rob Bygrave	8d9858f57a	Test only - Update logging for test TestQueryForUpdate	2025-07-11 23:35:03 +12:00
Rob Bygrave	9b520bc176	Bump avaje-config to 4.1	2025-07-11 23:22:16 +12:00
Rob Bygrave	44fd8e3a56	Adjust TestQueryForUpdate for Yugabyte - use markAsDirty on repeatable read test	2025-07-11 23:11:45 +12:00
Rob Bygrave	6910016c4d	Adjust TestQueryForUpdate for Yugabyte - use markAsDirty To see if the update has an impact on the 2nd thread waiting	2025-07-11 22:58:02 +12:00
Rob Bygrave	5f8a3c0591	Adjust TestQueryForUpdate for Yugabyte - check repeatable read isolation level	2025-07-11 22:05:31 +12:00
Rob Bygrave	0ae6956c1c	Bump ebean-datasource 10.1 with support for initialConnections (#3650 ) So in a K8s deployment, this adds support for having an initial number of connections to create initially (higher that min connections). This allows for a smoother deployment, by effectively having initially more connections than min in order to immediately take production load, and then over time trim back down towards the min connections. So in k8s I am setting min, initial and max connections, where initial connections is high enough to take full production load straight after readiness true.	2025-07-11 21:26:58 +12:00
Rob Bygrave	2e9c5d8548	Merge branch 'query-cache-oom-for-too-large-beans'	2025-07-11 21:19:21 +12:00
Rob Bygrave	93edc840b3	Add a test that hits the new branch of code	2025-07-11 21:18:00 +12:00
Josiah NoelandRob Bygrave	34311785fa	Fix Jackson NCDF Error (#3639 ) * fix jackson NCDF error split jackson SPI impl into it's own module * Restore format * Restore format * Trim up dependencies * Rename module to ebean-core-json --------- Co-authored-by: Rob Bygrave <robin.bygrave@gmail.com>	2025-07-11 20:53:25 +12:00
Rob Bygrave	63929f8ff3	Bump test Yugabyte version to 2.20.11.0-b34	2025-07-11 20:26:12 +12:00
Jonas Fröhler	d918c5117f	no import changes	2025-07-01 09:05:48 +02:00
Jonas Fröhler	dd845a7b0c	Fix imports	2025-07-01 09:02:26 +02:00
Jonas Fröhler	df0e4d57f0	Clean up	2025-06-27 12:17:19 +02:00
Jonas Fröhler	9c7fa25d49	Query Cache OOM test and potential draft for the fix	2025-06-27 12:14:01 +02:00