Version 16.3.0

Bump ebean-agent and avaje junit
Bump ebean-datasource to 10.3 (#3727 )
2026-09-20 11:17:36 +00:00 · 2026-02-16 21:07:49 +13:00 · 2026-02-16 21:03:37 +13:00 · 2026-02-16 20:24:58 +13:00 · 2026-02-16 19:49:56 +13:00 · 2026-02-15 21:47:17 +13:00
104 changed files with 656 additions and 382 deletions
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</version>
+    <version>16.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-pgvector-types</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  <artifactId>composites</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</version>
+    <version>16.3.0</version>
  </parent>

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

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

  /**
   * Execute the query returning a list.
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</version>
+    <version>16.3.0</version>
  </parent>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-pgvector</artifactId>
-        <version>16.1.1</version>
+        <version>16.3.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-pgvector-types</artifactId>
-        <version>16.1.1</version>
+        <version>16.3.0</version>
      </dependency>

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

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

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

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

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

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-json</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

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

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

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

@@ -15,8 +15,4 @@ public interface SpiQueryManyJoin {
   */
  String fetchOrderBy();

-  /**
-   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
-   */
-  String idNullOr(String filterManyExpression);
 }
@@ -338,11 +338,6 @@ public interface SpiTransaction extends Transaction {
   */
  boolean isNestedUseSavepoint();

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

-  @Override
-  public boolean isSkipCacheExplicit() {
-    return transaction.isSkipCacheExplicit();
-  }
-
  @Override
  public boolean isSkipCache() {
    return transaction.isSkipCache();
@@ -497,10 +497,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return cacheKey != null && query.queryCacheMode().isPut();
  }

-  public boolean isBeanCachePutMany() {
-    return !transaction.isSkipCacheExplicit() && query.isBeanCachePut();
-  }
-
  public boolean isBeanCachePut() {
    return !transaction.isSkipCache() && query.isBeanCachePut();
  }
@@ -36,11 +36,6 @@ public final class BeanFkeyProperty implements ElPropertyValue {
    return "prefix:" + prefix + " name:" + name + " dbColumn:" + dbColumn + " ph:" + placeHolder;
  }

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

-  @Override
-  public String idNullOr(String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
-
  @Override
  public void loadIgnore(DbReadContext ctx) {
    ctx.dataReader().incrementPos(1);
@@ -634,11 +634,6 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    return fetchOrderBy;
  }

-  @Override
-  public String idNullOr(String filterManyExpression) {
-    return targetIdBinder.idNullOr(name, filterManyExpression);
-  }
-
  /**
   * Return the order by for use when lazy loading the associated collection.
   */
@@ -154,4 +154,9 @@ public interface DbSqlContext {
   * as it was already added to the query.
   */
  boolean joinAdded();
+
+  /**
+   * Include the filter many predicates if specified into the JOIN clause.
+   */
+  void includeFilterMany();
 }
@@ -27,11 +27,6 @@ public interface IdBinder {
   */
  void initialise();

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

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

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

-  @Override
-  public String idNullOr(String name, String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
-
  @Override
  public String idSelect() {
    return "";
@@ -261,9 +261,4 @@ public final class IdBinderSimple implements IdBinder {
    final Object value = idProperty.getValue(bean);
    return scalarType.format(value);
  }
-
-  @Override
-  public String idNullOr(String prefix, String filterManyExpression) {
-    return "(${" + prefix + "}" + idProperty.dbColumn() + " is null or (" + filterManyExpression + "))";
-  }
 }
@@ -286,8 +286,4 @@ public final class ElPropertyChain implements ElPropertyValue {
    }
  }

-  @Override
-  public String idNullOr(String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
 }
@@ -715,7 +715,7 @@ final class CQueryBuilder {
      appendHistoryAsOfPredicate();
      appendFindId();
      appendToWhere(predicates.dbWhere());
-      appendToWhere(predicates.dbFilterMany());
+      appendToWhere(predicates.dbFilterManyWhere());
      if (!query.isIncludeSoftDeletes()) {
        appendSoftDelete();
      }
@@ -39,6 +39,7 @@ public final class CQueryPredicates {
  private final Object idValue;
  private final BindParams bindParams;
  private DefaultExpressionRequest filterMany;
+  private boolean filterManyJoin;
  /**
   * Bind values from the where expressions.
   */
@@ -106,6 +107,9 @@ public final class CQueryPredicates {
        dataBind.append(", ");
      }
    }
+    if (filterManyJoin) {
+      filterMany.bind(dataBind);
+    }
    if (idValue != null) {
      // this is a find by id type query...
      request.descriptor().bindId(dataBind, idValue);
@@ -119,7 +123,7 @@ public final class CQueryPredicates {
    if (where != null) {
      where.bind(dataBind);
    }
-    if (filterMany != null) {
+    if (!filterManyJoin && filterMany != null) {
      filterMany.bind(dataBind);
    }
    if (having != null) {
@@ -189,9 +193,10 @@ public final class CQueryPredicates {
      if (chunk != null) {
        SpiExpressionList<?> filterManyExpr = chunk.getFilterMany();
        if (filterManyExpr != null) {
-          this.filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr);
+          filterManyJoin = chunk.isFilterManyJoin();
+          filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr);
          if (buildSql) {
-            dbFilterMany = manyProperty.idNullOr(filterMany.buildSql());
+            dbFilterMany = filterMany.buildSql();
          }
        }
      }
@@ -339,10 +344,17 @@ public final class CQueryPredicates {
  }

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

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

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

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

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

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

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

+import jakarta.persistence.NonUniqueResultException;
 import jakarta.persistence.PersistenceException;

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

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

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

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

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

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

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

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

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

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

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

@@ -1475,8 +1475,8 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
  }

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

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

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

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

+  /**
+   * Return true if there is a filterMany and it should be included in the JOIN.
+   */
+  public boolean isFilterManyJoin() {
+    return filterMany != null && !markForQueryJoin;
+  }
+
  /**
   * Adjust filterMany expressions for inclusion in main query.
   */
@@ -150,11 +150,6 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    return false;
  }

-  @Override
-  public boolean isSkipCacheExplicit() {
-    return false;
-  }
-
  @Override
  public void setSkipCache(boolean skipCache) {
  }
@@ -209,11 +209,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    return autoPersistUpdates;
  }

-  @Override
-  public final boolean isSkipCacheExplicit() {
-    return (skipCache != null && !skipCache);
-  }
-
  @Override
  public final boolean isSkipCache() {
    if (skipCache != null) return skipCache;
@@ -235,11 +235,6 @@ final class NoTransaction implements SpiTransaction {
  public void setSkipCache(boolean skipCache) {
  }

-  @Override
-  public boolean isSkipCacheExplicit() {
-    return false;
-  }
-
  @Override
  public boolean isSkipCache() {
    return false;
@@ -55,7 +55,7 @@ class BasicProfileLocationTest {
    DProfileLocation loc = new DTimedProfileLocation("foo", MetricFactory.get().createTimedMetric("junk"));

    assertThat(loc.obtain()).isTrue();
-    assertThat(loc.fullLocation()).endsWith("org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:728)");
+    assertThat(loc.fullLocation()).endsWith("org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:786)");
    assertThat(loc.location()).isEqualTo("org.junit.platform.commons.util.ReflectionUtils.invokeMethod");
    assertThat(loc.label()).isEqualTo("ReflectionUtils.invokeMethod");
  }
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</version>
+    <version>16.3.0</version>
  </parent>

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

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

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

@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</version>
+    <version>16.3.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>provided</scope>
    </dependency>

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

  <name>ebean net postgis types</name>
@@ -19,14 +19,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -54,7 +54,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

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

  <name>ebean pgvector types</name>
@@ -19,14 +19,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -54,7 +54,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

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

  <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -62,7 +62,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

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

  <name>ebean querybean</name>
@@ -17,7 +17,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>provided</scope>
    </dependency>

@@ -59,14 +59,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

@@ -80,7 +80,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>provided</scope>
    </dependency>

@@ -739,8 +739,8 @@ public abstract class QueryBean<T, R extends QueryBean<T, R>> implements IQueryB
  }

  @Override
-  public final R usingMaster() {
-    query.usingMaster();
+  public R usingMaster(boolean useMaster) {
+    query.usingMaster(useMaster);
    return root;
  }

@@ -328,7 +328,7 @@ public class QCustomerTest {
      .query();

    q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterMany */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name like ? escape'|' and t1.email is not null)) order by t0.id");
+    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterMany */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and t1.first_name like ? escape'|' and t1.email is not null order by t0.id");
  }

  @Test
@@ -340,7 +340,7 @@ public class QCustomerTest {
      .query();

    q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterManySingle */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name like ? escape'|')) order by t0.id");
+    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterManySingle */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and t1.first_name like ? escape'|' order by t0.id");
  }

  @Test
@@ -375,7 +375,7 @@ public class QCustomerTest {
      .query();

    q.findList();
-    assertThat(q.getGeneratedSql()).contains(" from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name like ? and t1.first_name like ? escape'|')) order by t0.id");
+    assertThat(q.getGeneratedSql()).contains(" from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and t1.first_name like ? and t1.first_name like ? escape'|' order by t0.id");
  }

  @Test
@@ -389,7 +389,7 @@ public class QCustomerTest {
      .query();

    q.findList();
-    assertThat(q.getGeneratedSql()).contains(" from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or ((t1.first_name like ? escape'|' or t1.last_name like ? escape'|'))) order by t0.id");
+    assertThat(q.getGeneratedSql()).contains(" from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and (t1.first_name like ? escape'|' or t1.last_name like ? escape'|') order by t0.id");
  }

  @Test
@@ -406,7 +406,7 @@ public class QCustomerTest {
      .query();

    q.findList();
-    assertThat(q.getGeneratedSql()).contains(" t0.id, t0.name, t1.id, t1.email from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name like ? escape'|')) order by t0.id");
+    assertThat(q.getGeneratedSql()).contains(" t0.id, t0.name, t1.id, t1.email from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and t1.first_name like ? escape'|' order by t0.id");
  }

  @Test
@@ -446,6 +446,22 @@ public class QCustomerTest {
      .findList();
  }

+  @Test
+  public void usingMaster_true() {
+    new QCustomer()
+      .registered.isNull()
+      .usingMaster(true)
+      .findList();
+  }
+
+  @Test
+  public void usingMaster_false() {
+    new QCustomer()
+      .registered.isNull()
+      .usingMaster(false)
+      .findList();
+  }
+
  @Test
  public void usingTransaction() {
    try (Transaction transaction = DB.getDefault().createTransaction()) {
@@ -22,7 +22,7 @@ class QDataWithFormulaMainTest {

    List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains(" where ((t1.main_id is null and t1.meta_key is null and t1.value_index is null) or (t1.meta_key = ?)) order by t0.id");
+    assertThat(sql.get(0)).contains(" from data_with_formula_main t0 left join data_with_formula t1 on t1.main_id = t0.id and t1.meta_key = ? order by t0.id");
  }

  @Test
@@ -36,6 +36,6 @@ class QDataWithFormulaMainTest {

    List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains(" where ((t1.main_id is null and t1.meta_key is null and t1.value_index is null) or (t1.meta_key = ?)) order by t0.id");
+    assertThat(sql.get(0)).contains(" left join data_with_formula t1 on t1.main_id = t0.id and t1.meta_key = ? order by t0.id");
  }
 }
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</version>
+    <version>16.3.0</version>
  </parent>

  <artifactId>ebean-redis</artifactId>
@@ -29,35 +29,35 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>provided</scope>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>provided</scope>
    </dependency>

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

  <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>provided</scope>
    </dependency>

@@ -77,7 +77,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

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

  <name>ebean test</name>
@@ -13,7 +13,7 @@

  <properties>
    <bytebuddy.version>1.18.1</bytebuddy.version>
-    <assertj.version>3.27.6</assertj.version>
+    <assertj.version>3.27.7</assertj.version>
  </properties>

  <dependencies>
@@ -33,20 +33,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

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

    <dependency>
@@ -149,14 +149,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

@@ -226,7 +226,7 @@
    <dependency>
      <groupId>com.microsoft.sqlserver</groupId>
      <artifactId>mssql-jdbc</artifactId>
-      <version>10.2.0.jre8</version>
+      <version>11.1.0.jre8-preview</version>
      <scope>test</scope>
    </dependency>

@@ -155,6 +155,34 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
    }
  }

+  @Test
+  public void asDto_usingMaster_true() {
+    asDtoUsingMaster(true);
+  }
+
+  @Test
+  public void asDto_usingMaster_false() {
+    asDtoUsingMaster(false);
+  }
+
+  private void asDtoUsingMaster(boolean useMaster) {
+    ResetBasicData.reset();
+    LoggedSql.start();
+
+    DtoQuery<ContactDto> query = DB.find(Contact.class)
+      .select("id, email")
+      .where().isNotNull("email")
+      .asDto(ContactDto.class)
+      .usingMaster(useMaster);
+
+    List<ContactDto> dtos = query.findList();
+
+    assertThat(dtos).isNotEmpty();
+    for (ContactDto dto : dtos) {
+      assertThat(dto.getEmail()).isNotNull();
+    }
+  }
+
  @Test
  public void asDto_withExplicitId() {

@@ -68,11 +68,15 @@ public class TestQueryUsingConnection extends BaseTestCase {

      final int otherCount = DB.find(Country.class).findCount();
      final int masterCount = DB.find(Country.class).usingMaster().findCount();
+      final int masterCount2 = DB.find(Country.class).usingMaster(true).findCount();
+      final int masterCount3 = DB.find(Country.class).usingMaster(false).findCount();

      transaction.rollback();

      assertThat(count).isEqualTo(otherCount + 1);
      assertThat(otherCount).isEqualTo(masterCount);
+      assertThat(otherCount).isEqualTo(masterCount2);
+      assertThat(otherCount).isEqualTo(masterCount3);
    }
  }

@@ -124,7 +124,7 @@ public class TestBeanCache extends BaseTestCase {
    ServerCacheStatistics statistics = beanCache.statistics(true);
    assertThat(statistics.getHitCount()).isEqualTo(0);
    assertThat(statistics.getMissCount()).isEqualTo(0);
-    assertThat(statistics.getPutCount()).isEqualTo(2);
+    assertThat(statistics.getPutCount()).isEqualTo(0);
  }

  @Test
@@ -0,0 +1,27 @@
+package org.tests.model.basic;
+
+import io.ebean.Model;
+import jakarta.persistence.*;
+
+@Entity
+public class Building extends Model {
+  public static final String CAFE = "cafe";
+  public static final String HOUSE = "house";
+  public static final String STORE = "store";
+
+  @Id
+  public int id;
+  @Column(nullable = false)
+  public String type;
+  @Column(name = "lvl")
+  public int level;
+  public final String name;
+  @ManyToOne(optional = false)
+  public final Clan clan;
+
+  public Building(Clan clan, String type, String name) {
+    this.clan = clan;
+    this.type = type;
+    this.name = name;
+  }
+}
@@ -0,0 +1,17 @@
+package org.tests.model.basic;
+
+import io.ebean.Model;
+import jakarta.persistence.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class Clan extends Model {
+
+  @Id
+  public int id;
+
+  @OneToMany(cascade = CascadeType.ALL)
+  public List<Building> buildings = new ArrayList<>();
+}
@@ -0,0 +1,18 @@
+package org.tests.model.basic;
+
+import io.ebean.Model;
+import jakarta.persistence.*;
+
+@Entity
+public class ClanQuest extends Model {
+
+  @Id
+  public int id;
+
+  @ManyToOne(optional = false)
+  public final Clan clan;
+
+  public ClanQuest(Clan clan) {
+    this.clan = clan;
+  }
+}
@@ -6,13 +6,12 @@ import io.ebean.ExpressionList;
 import io.ebean.Query;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.Order;
-import org.tests.model.basic.ResetBasicData;
+import org.tests.model.basic.*;

 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -175,7 +174,8 @@ public class TestQueryFilterMany extends BaseTestCase {
    assertThat(customers).isNotEmpty();
    List<String> sqlList = LoggedSql.stop();
    assertEquals(1, sqlList.size());
-    assertThat(sqlList.get(0)).contains(" where lower(t0.name) = ? and (t1.id is null or (t1.status = ?)) order by t0.id");
+    assertThat(sqlList.get(0)).contains(" left join o_customer t2 on t2.id = t1.kcustomer_id and t1.status = ? where ");
+    assertThat(sqlList.get(0)).contains(" where lower(t0.name) = ? order by t0.id");
  }

  @Test
@@ -211,8 +211,7 @@ public class TestQueryFilterMany extends BaseTestCase {
    assertThat(result).isNotEmpty();
    List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("from o_customer t0 left join o_order t1");
-    assertThat(sql.get(0)).contains("where (t1.id is null or (t1.order_date is not null)) order by t0.id");
+    assertThat(sql.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id and t1.order_date is not null order by t0.id");
  }

  @Test
@@ -231,25 +230,78 @@ public class TestQueryFilterMany extends BaseTestCase {
  }

  @Test
-  public void test_filterMany_with_isNotEmpty() {
+  public void test_filterMany_excludedExplicitly() {
+    Clan clan = new Clan();
+    ClanQuest quest = new ClanQuest(clan);
+    DB.saveAll(clan, quest);

+    LoggedSql.start();
+
+    // fetch when there are no buildings at all
+    Optional<ClanQuest> result = DB.find(ClanQuest.class)
+      .setId(quest.id)
+      .fetch("clan", "buildings")
+      .filterMany("clan.buildings").eq("type", Building.CAFE)
+      .findOneOrEmpty();
+
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains(" left join building t2 on t2.clan_id = t1.id and t2.type = ? where t0.id = ? order by t0.id");
+    assertThat(result).isPresent();
+    List<Building> emptyBuildings = result.map(r -> r.clan.buildings).orElseThrow();
+    assertThat(emptyBuildings).isEmpty();
+
+    // add some buildings
+    var b0 = new Building(clan, Building.CAFE, "b0");
+    var b1 = new Building(clan, Building.CAFE, "b1");
+    var b2 = new Building(clan, Building.HOUSE, "b2");
+    DB.saveAll(b0, b1, b2);
+
+    // fetch with some buildings to match the filter many predicate
+    Optional<ClanQuest> resultWithBuildings = DB.find(ClanQuest.class)
+      .setId(quest.id)
+      .fetch("clan", "buildings")
+      .filterMany("clan.buildings").eq("type", Building.CAFE)
+      .findOneOrEmpty();
+
+    List<Building> someBuildings = resultWithBuildings.map(r -> r.clan.buildings).orElseThrow();
+    assertThat(someBuildings).hasSize(2);
+    assertThat(someBuildings.stream().map(b -> b.name).collect(Collectors.toList())).contains("b0", "b1");
+
+    // fetch with no matching buildings
+    Optional<ClanQuest> resultWithNoMatchingBuildings = DB.find(ClanQuest.class)
+      .setId(quest.id)
+      .fetch("clan", "buildings")
+      .filterMany("clan.buildings").eq("type", Building.STORE)
+      .findOneOrEmpty();
+
+    List<Building> noMatchingBuildings = resultWithNoMatchingBuildings.map(r -> r.clan.buildings).orElseThrow();
+    assertThat(noMatchingBuildings).isEmpty();
+  }
+
+  @Test
+  void test_filterMany_with_isNotEmpty() {
    ResetBasicData.reset();

    LoggedSql.start();

    Query<Customer> query = DB.find(Customer.class)
-      .filterMany("orders").raw("1=0")
+      .setUnmodifiable(true)
+      .select("id, status, name")
+      .fetch("orders", "status, orderDate, shipDate")
+      .filterMany("orders").raw("1 = 0")
      .where().isNotEmpty("orders")
      .query();

    List<Customer> list = query.findList();
+
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains(" from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null and 1 = 0 where exists ");
+    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t1.id, t1.status, t1.order_date, t1.ship_date from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null and 1 = 0 where exists (select 1 from o_order x where x.kcustomer_id = t0.id and x.order_date is not null) order by t0.id; --bind()");
    for (Customer customer : list) {
      assertThat(customer.getOrders()).isEmpty();
    }
-
-    List<String> sqlList = LoggedSql.stop();
-    assertEquals(1, sqlList.size());
-    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where exists (select 1 from o_order x where x.kcustomer_id = t0.id and x.order_date is not null) and (t1.id is null or (1=0)) order by t0.id");
  }

  @Test
@@ -287,11 +339,10 @@ public class TestQueryFilterMany extends BaseTestCase {

    List<String> sqlList = LoggedSql.stop();
    assertEquals(1, sqlList.size());
-    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where (t1.id is null or (t1.status ");
    if (isPostgresCompatible()) {
-      assertThat(sqlList.get(0)).contains("where (t1.id is null or (t1.status = any(?))) order by t0.id");
+      assertThat(sqlList.get(0)).contains("left join o_customer t2 on t2.id = t1.kcustomer_id and t1.status = any(?) order by t0.id");
    } else {
-      assertThat(sqlList.get(0)).contains("where (t1.id is null or (t1.status in (?))) order by t0.id");
+      assertThat(sqlList.get(0)).contains("left join o_customer t2 on t2.id = t1.kcustomer_id and t1.status in (?) order by t0.id");
    }
  }

@@ -335,7 +386,7 @@ public class TestQueryFilterMany extends BaseTestCase {

    List<String> sql = LoggedSql.stop();
    assertEquals(1, sql.size());
-    assertSql(sql.get(0)).contains(" from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where (t1.id is null or ((t1.status = ? or t1.order_date = ?))) order by t0.id");
+    assertSql(sql.get(0)).contains(" left join o_customer t2 on t2.id = t1.kcustomer_id and (t1.status = ? or t1.order_date = ?) order by t0.id");
  }

  @Test
@@ -351,7 +402,7 @@ public class TestQueryFilterMany extends BaseTestCase {
    List<String> sql = LoggedSql.stop();

    assertThat(sql.size()).isGreaterThan(1);
-    assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name is not null)) order by t0.id; --bind()");
+    assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id and t1.first_name is not null order by t0.id; --bind()");
    platformAssertIn(sql.get(1), " from contact_note t0 where (t0.contact_id)");
    assertSql(sql.get(1)).contains(" and lower(t0.title) like");
  }
@@ -389,9 +440,26 @@ public class TestQueryFilterMany extends BaseTestCase {

    assertThat(sql).hasSize(1);
    if (isSqlServer()) {
-      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.id is null or ((t1.first_name is not null and lower(t1.email) like ?))) order by t0.id; --bind(rob%)");
+      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id and (t1.first_name is not null and lower(t1.email) like ?) order by t0.id; --bind(rob%)");
    } else {
-      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.id is null or ((t1.first_name is not null and lower(t1.email) like ? escape'|'))) order by t0.id; --bind(rob%)");
+      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id and (t1.first_name is not null and lower(t1.email) like ? escape'|') order by t0.id; --bind(rob%)");
    }
  }
+
+  @Test
+  void testFilterManyWithNestedPathExpression() {
+    ResetBasicData.reset();
+    LoggedSql.start();
+
+    DB.find(Customer.class)
+      .select("id, name")
+      .fetch("contacts", "firstName, email")
+      .filterMany("contacts").eq("group.name", "DoesNotExist").isNotNull("cretime")
+      .findList();
+
+    List<String> sql = LoggedSql.stop();
+
+    assertThat(sql).hasSize(1);
+    assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id left join contact_group t2 on t2.id = t1.group_id and t2.name = ? and t1.cretime is not null order by t0.id");
+  }
 }
@@ -20,7 +20,7 @@ class TestQueryFilterManyOnM2M extends BaseTestCase {

    List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.userid, t0.user_name, t0.user_type_id, t1.role_id, t1.role_name from muser t0 left join mrole_muser t1z_ on t1z_.muser_userid = t0.userid left join mrole t1 on t1.role_id = t1z_.mrole_role_id where (t1.role_id is null or (lower(t1.role_name) like ");
+    assertThat(sql.get(0)).contains(" left join mrole t1 on t1.role_id = t1z_.mrole_role_id and lower(t1.role_name) like ");
    assertThat(sql.get(0)).contains("order by t0.userid;");
  }

@@ -35,7 +35,7 @@ public class TestQueryFilterManySimple extends BaseTestCase {
    list.get(0).getOrders().size();
    List<String> sql = LoggedSql.stop();
    assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where");
+    assertThat(sql.get(0)).contains("left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id and t1.status = ? and t1.order_date > ?");
    assertThat(sql.get(0)).contains("order by t0.id");
    if (isPostgresCompatible()) {
      assertThat(sql.get(1)).contains("from contact t0 where (t0.customer_id) = any(?) and t0.first_name is not null;");
@@ -43,4 +43,19 @@ public class TestQueryFilterManySimple extends BaseTestCase {
      assertThat(sql.get(1)).contains("from contact t0 where (t0.customer_id) in (?) and t0.first_name is not null;");
    }
  }
+
+  @Test
+  void testNestedFilterMany() {
+    ResetBasicData.reset();
+
+    LoggedSql.start();
+    DB.find(Customer.class)
+      .fetch("orders")
+      .filterMany("orders").eq("customer.status", Customer.Status.NEW)
+      .findList();
+
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id and t2.status = ? order by t0.id");
+  }
 }
@@ -75,16 +75,18 @@ public class TestOrderByWithDistinct extends BaseTestCase {
      assertSql(query).startsWith("select distinct on (t0.id, t2.name, t1.id) t0.id, t0.parent_id, t0.ref_id, t1.id, t1.parent_id, t1.ref_id, t2.name "
        + "from e_basic_tree t0 "
        + "left join e_basic_tree t1 on t1.parent_id = t0.id "
+        + "left join e_basic t2 on t2.id = t1.ref_id "
        + "join e_basic_tree u1 on u1.parent_id = t0.id "
-        + "join e_basic u2 on u2.id = u1.ref_id left "
-        + "join e_basic t2 on t2.id = t1.ref_id where u2.status = ? order by t0.id, t2.name");
+        + "join e_basic u2 on u2.id = u1.ref_id "
+        + "where u2.status = ? order by t0.id, t2.name");
    } else {
      assertSql(query).startsWith("select distinct t0.id, t0.parent_id, t0.ref_id, t1.id, t1.parent_id, t1.ref_id, t2.name "
        + "from e_basic_tree t0 "
        + "left join e_basic_tree t1 on t1.parent_id = t0.id "
+        + "left join e_basic t2 on t2.id = t1.ref_id "
        + "join e_basic_tree u1 on u1.parent_id = t0.id "
-        + "join e_basic u2 on u2.id = u1.ref_id left "
-        + "join e_basic t2 on t2.id = t1.ref_id where u2.status = ? order by t0.id, t2.name");
+        + "join e_basic u2 on u2.id = u1.ref_id "
+        + "where u2.status = ? order by t0.id, t2.name");
    }
  }

@@ -785,9 +785,10 @@ class TestQuerySingleAttribute extends BaseTestCase {
      .query();

    List<Order.Status> statusList = query.findSingleAttributeList();
-    assertSql(query)
+    String sql = sqlOf(query);
+    assertThat(sql)
      .contains("select distinct t1.status from o_customer t0 "
-        + "left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null where (t1.id is null or (t1.status is not null))")
+        + "left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null and t1.status is not null")
      .doesNotContain("order by");

    assertThat(statusList).hasSize(4);
@@ -6,6 +6,7 @@ import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.test.LoggedSql;
+import jakarta.persistence.NonUniqueResultException;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
@@ -21,6 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;

 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;

 class SqlQueryTests extends BaseTestCase {
@@ -85,6 +87,19 @@ class SqlQueryTests extends BaseTestCase {
    assertThat(val2).isEqualTo(11);
  }

+  @Test
+  void findSingleAttribute_whenMultipleRows_expect_NonUniqueResultException() {
+    ResetBasicData.reset();
+    String sql = "select id from o_order order by id desc";
+
+    assertThatThrownBy(() -> {
+      DB.sqlQuery(sql)
+        .mapToScalar(Long.class)
+        .findOne();
+    }).isInstanceOf(NonUniqueResultException.class)
+      .hasMessageContaining("Got more than 1 result for findSingleAttribute");
+  }
+
  @Test
  void findSingleAttributeList_decimal() {
    ResetBasicData.reset();
@@ -265,6 +280,28 @@ class SqlQueryTests extends BaseTestCase {
    assertThat(custDtos).isNotEmpty();
  }

+  @Test
+  void queryUsingMaster_true() {
+    queryUsingMasterAsParameter(true);
+  }
+
+  @Test
+  void queryUsingMaster_false() {
+    queryUsingMasterAsParameter(false);
+  }
+
+  void queryUsingMasterAsParameter(boolean useMaster) {
+    ResetBasicData.reset();
+
+    String sql = "select id, name, status from o_customer where name is not null";
+    List<CustDto> custDtos = DB.sqlQuery(sql)
+      .usingMaster(useMaster)
+      .mapTo(CUST_MAPPER)
+      .findList();
+
+    assertThat(custDtos).isNotEmpty();
+  }
+
  @Test
  void queryUsingConnection() throws SQLException {
    ResetBasicData.reset();
@@ -373,6 +410,18 @@ class SqlQueryTests extends BaseTestCase {
    assertThat(rob.name).isEqualTo("Rob");
  }

+  @Test
+  void findOne_mapper_when_notUnique() {
+    ResetBasicData.reset();
+
+    String sql = "select id, name, status from o_customer order by name desc";
+    assertThatThrownBy(() -> DB.sqlQuery(sql)
+      .mapTo(CUST_MAPPER)
+      .findOne())
+      .isInstanceOf(NonUniqueResultException.class)
+      .hasMessageContaining("Got more than 1 result for findOne");
+  }
+
  @Test
  void findList_mapper() {
    ResetBasicData.reset();
@@ -15,8 +15,8 @@ mvn -T 4 clean package
 mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests

 ## git commit, git tag, git push --tags
-git commit -am 'Version 16.1.1'
-git tag 16.1.1
+git commit -am 'Version 16.3.0'
+git tag 16.3.0
 git push --tags

 ## convert to javax
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</version>
+    <version>16.3.0</version>
  </parent>

  <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

@@ -35,7 +35,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

@@ -56,14 +56,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
      <scope>test</scope>
    </dependency>

@@ -83,7 +83,7 @@
      <plugin>
        <groupId>org.jetbrains.kotlin</groupId>
        <artifactId>kotlin-maven-plugin</artifactId>
-        <version>2.2.10</version>
+        <version>2.3.10</version>
        <executions>
          <execution>
            <id>test-compile</id>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</version>
+    <version>16.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -16,67 +16,67 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</version>
+    <version>16.3.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

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

@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>16.1.1</version>
+      <version>16.3.0</version>
    </dependency>

  </dependencies>
@@ -9,7 +9,7 @@

  <groupId>io.ebean</groupId>
  <artifactId>ebean-parent</artifactId>
-  <version>16.1.1</version>
+  <version>16.3.0</version>
  <packaging>pom</packaging>

  <name>ebean parent</name>
@@ -49,9 +49,9 @@
    <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
    <ebean-migration.version>14.3.0</ebean-migration.version>
    <ebean-test-containers.version>7.17</ebean-test-containers.version>
-    <ebean-datasource.version>10.2</ebean-datasource.version>
-    <ebean-agent.version>16.1.1</ebean-agent.version>
-    <ebean-maven-plugin.version>16.1.1</ebean-maven-plugin.version>
+    <ebean-datasource.version>10.3</ebean-datasource.version>
+    <ebean-agent.version>16.3.0</ebean-agent.version>
+    <ebean-maven-plugin.version>16.3.0</ebean-maven-plugin.version>
    <surefire.useModulePath>false</surefire.useModulePath>
  </properties>

@@ -60,14 +60,14 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>junit</artifactId>
-      <version>1.5</version>
+      <version>1.8</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>ch.qos.logback</groupId>
      <artifactId>logback-classic</artifactId>
-      <version>1.5.13</version>
+      <version>1.5.31</version>
      <scope>test</scope>
    </dependency>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rob Bygrave	69c932816a	Version 16.3.0	2026-02-16 21:07:49 +13:00
Rob Bygrave	a1facf527b	Bump ebean-agent and avaje junit	2026-02-16 21:03:37 +13:00
Rob BygraveandGitHub	ec42ebf66d	Bump ebean-datasource to 10.3 (#3727 ) This version has moved the connection initialisation that sets the autoCommit mode to be after the clientInfo and any initial sql has been executed	2026-02-16 20:24:58 +13:00
Rob Bygrave	5dede70801	Fix for #3722 Remove isSkipCacheExplicit() and use isSkipCache() This change is to reduce PUTs causing cache pollution where changes that are rolled back are PUT into the bean cache. Effectively remove the isSkipCacheExplicit() feature and just use the existing isSkipCache(). This means that skipCacheAfterWrite is used and PUTs after a database write/insert/update/delete are effectively skipped.	2026-02-16 19:49:56 +13:00
Rob BygraveandGitHub	b2f02ecc1f	Fix for #3723 FilterMany predicates added to incorrect join clause (#3725 ) The change that moved the filterMany predicates to the join had an issue that extra joins may be needed to support those predicates. Prior to this change, the extra predicates where effectively just added to the end of the joins, rather than as a "child" node in the SqlTreeNode tree. This fix is in SqlTreeBuilder, where the list of top level extra joins are first tried to be added as a child to a parent node, and only if we can't find the parent added at the end.	2026-02-15 21:47:17 +13:00
dependabot[bot]GitHub github	15fa7cd1c2	Bump org.assertj:assertj-core from 3.27.6 to 3.27.7 in /ebean-test (#3718 ) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.6 to 3.27.7. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.6...assertj-build-3.27.7) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-version: 3.27.7 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-02-15 10:02:49 +13:00
Rob BygraveandGitHub	8dced38cd5	Bump kotlin maven plugin version in build (#3724 ) * Bump kotlin maven plugin version in build * For build bump kotlin-maven-plugin version to 2.3.10	2026-02-15 09:59:16 +13:00
Rob Bygrave	7addba7c93	Version 16.2.1	2026-02-02 23:22:22 +13:00
Rob BygraveandGitHub	00b45c1642	For query usingMaster support passing a boolean (#3721 ) This is to support the use case where other logic is used to determine if a query should be "forced" to use the master data source or not, and so it's easier to pass that as a boolean to the usingMaster() method.	2026-02-02 23:17:37 +13:00
Rob Bygrave	a3d9711fe6	Version 16.2.0	2025-11-23 22:18:54 +13:00
Rob Bygrave	1239c50723	Bump ebean-agent to 16.2.0	2025-11-23 22:16:29 +13:00
Rob BygraveandGitHub	d85d8449e2	#3695 Behaviour change: findSingleAttribute() to throw when multiple … (#3697 ) * #3695 Behaviour change: findSingleAttribute() to throw when multiple rows returned by query On the plus, this makes the behaviour consistent with all the other findOne() methods (ORM, DTO, SqlQuery) and this very much feels like buggy behaviour [to just get the first result and ignore any subsequent results in the ResultSet] On the negative of merging this bug fix, any application code relying on the existing behaviour with this fix will break and throw a NonUniqueResultException at RUNTIME (not ideal). However, for these cases where the application now throws an exception, people might not be aware that they were relying on this behaviour and this exception could be useful to highlight that (a potential non-deterministic query result was being used and a potential source of bugs was being). * Change SqlQuery + Mapper + findOne() also to throw NonUniqueResultException	2025-11-23 22:14:44 +13:00
dependabot[bot]GitHub github	baf71cbab3	Bump com.microsoft.sqlserver:mssql-jdbc in /ebean-test (#3694 ) Bumps [com.microsoft.sqlserver:mssql-jdbc](https://github.com/Microsoft/mssql-jdbc) from 10.2.0.jre8 to 11.1.0.jre8-preview. - [Release notes](https://github.com/Microsoft/mssql-jdbc/releases) - [Changelog](https://github.com/microsoft/mssql-jdbc/blob/main/CHANGELOG.md) - [Commits](https://github.com/Microsoft/mssql-jdbc/commits) --- updated-dependencies: - dependency-name: com.microsoft.sqlserver:mssql-jdbc dependency-version: 11.1.0.jre8-preview dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-11-23 21:01:00 +13:00
Rob BygraveandGitHub	ff0ca35e54	#3701 Improve error message when missing dependency ebean-jackson-mapper (#3708 )	2025-11-23 20:25:16 +13:00
Rob Bygrave GitHub Roman Parshikov	0fc9a1ac2f	Bug fix and change filterMany to put predicates into JOIN clause, Fix for #3626 (#3707 ) * Problem with filterMany * Missing id * Other test * Fix * Update TestQueryFilterMany.java * #3706 Bug fix and change filterMany to put predicates into JOIN clause, Fix for #3626 * Fix tests for Postgres, Oracle, Sql Server --------- Co-authored-by: Roman Parshikov <promansew@gmail.com>	2025-11-23 20:20:13 +13:00