Merge branch 'master' into fix/3129

Fixes the test as we now use QueryBean etc rather than TQRootBean

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -60,13 +60,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

composites/pom.xml

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

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <name>ebean api</name>

ebean-api/src/main/java/io/ebean/QueryBuilderProjection.java

@@ -40,6 +40,13 @@ public interface QueryBuilderProjection<SELF, T> {
    */
   SELF select(String fetchProperties);
 
+  /**
+   * Set DISTINCT ON clause. This is a Postgres only SQL feature.
+   *
+   * @param distinctOn The properties to include in the DISTINCT ON clause.
+   */
+  SELF distinctOn(String distinctOn);
+
   /**
    * Apply the fetchGroup which defines what part of the object graph to load.
    */

ebean-api/src/main/java/io/ebean/config/dbplatform/AnsiSqlRowsLimiter.java

@@ -4,22 +4,8 @@ public final class AnsiSqlRowsLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-    String dbSql = request.getDbSql();
-    StringBuilder sb = new StringBuilder(50 + dbSql.length());
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append(dbSql);
-    int firstRow = request.getFirstRow();
-    if (firstRow > 0) {
-      sb.append(" offset ").append(firstRow).append(" rows");
-    }
-    int maxRows = request.getMaxRows();
-    if (maxRows > 0) {
-      sb.append(" fetch next ").append(maxRows).append(" rows only");
-    }
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
+    final var ansiSql = request.ansiOffsetRows();
+    final var sql = request.getDbPlatform().completeSql(ansiSql, request.getOrmQuery());
     return new SqlLimitResponse(sql);
   }
 }

ebean-api/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java

@@ -7,23 +7,16 @@ public final class LimitOffsetSqlLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-    String dbSql = request.getDbSql();
-    StringBuilder sb = new StringBuilder(50 + dbSql.length());
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append(dbSql);
+    final var buffer = request.selectDistinctOnSql();
     int maxRows = request.getMaxRows();
     if (maxRows > 0) {
-      sb.append(" limit ").append(maxRows);
+      buffer.append(" limit ").append(maxRows);
     }
     int firstRow = request.getFirstRow();
     if (firstRow > 0) {
-      sb.append(" offset ").append(firstRow);
+      buffer.append(" offset ").append(firstRow);
     }
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-    return new SqlLimitResponse(sql);
+    return new SqlLimitResponse(request.getDbPlatform().completeSql(buffer.toString(), request.getOrmQuery()));
   }
 
 }

ebean-api/src/main/java/io/ebean/config/dbplatform/SqlLimitRequest.java

@@ -8,6 +8,21 @@ import io.ebean.Query;
  */
 public interface SqlLimitRequest {
 
+  /**
+   * Return ANSI SQL Offset and next rows.
+   */
+  String ansiOffsetRows();
+
+  /**
+   * Create and return buffer including the select distinct clause.
+   */
+  StringBuilder selectDistinct();
+
+  /**
+   * Create and return buffer including the select distinct on clause.
+   */
+  StringBuilder selectDistinctOnSql();
+
   /**
    * Return true if the query uses distinct.
    */

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,25 +89,25 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
@@ -125,13 +125,13 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
@@ -155,37 +155,37 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-spring-txn</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <!-- platforms -->
@@ -193,79 +193,79 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-clickhouse</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis-types</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>14.1.0</version>
+        <version>14.3.0</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <!--
@@ -147,21 +147,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -417,6 +417,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   @Override
   SpiQuery<T> copy();
 
+  /**
+   * Return the distinct on clause.
+   */
+  String distinctOn();
+
   /**
    * Return a copy of the query attaching to a different EbeanServer.
    */
@@ -522,7 +527,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    * Return true if the query should include the Id property.
    * <p>
    * distinct and single attribute queries exclude the Id property.
-   * </p>
    */
   boolean isWithId();
 

ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java

@@ -378,6 +378,9 @@ public final class InternalConfiguration {
    */
   private DataTimeZone initDataTimeZone() {
     String tz = config.getDataTimeZone();
+    if ("NoTimeZone".equals(tz)) {
+      return new NoDataTimeZone();
+    }
     if (tz == null) {
       if (isMySql(getPlatform())) {
         return new MySqlDataTimeZone();

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java

@@ -713,9 +713,9 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   }
 
   /**
-   * creates a mutableHash for the given JSON value.
+   * creates a mutableHash for the given Object value.
    */
-  public MutableValueInfo createMutableInfo(String json) {
+  public MutableValueInfo createMutableInfo(Object value) {
     throw new UnsupportedOperationException();
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java

@@ -39,22 +39,22 @@ public final class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
   }
 
   @Override
-  public MutableValueInfo createMutableInfo(String json) {
+  public MutableValueInfo createMutableInfo(Object value) {
     if (sourceDetection) {
-      return new SourceMutableValue(scalarType, json);
+      return new SourceMutableValue(scalarType, value);
     } else {
-      return new ChecksumMutableValue(scalarType, json);
+      return new ChecksumMutableValue(scalarType, value);
     }
   }
 
   /**
    * Next when no prior MutableValueInfo.
    */
-  private MutableValueNext next(String json) {
+  private MutableValueNext next(String json, Object value) {
     if (sourceDetection) {
-      return new SourceMutableValue(scalarType, json);
+      return new SourceMutableValue(scalarType, value);
     } else {
-      return new NextPair(json, new ChecksumMutableValue(scalarType, json));
+      return new NextPair(json, new ChecksumMutableValue(scalarType, value));
     }
   }
 
@@ -66,12 +66,13 @@ public final class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
     // mutation detection based on json content or checksum of json content
     // only perform serialisation to json once
     final String json = scalarType.format(value);
+
     final MutableValueInfo oldHash = ebi.mutableInfo(propertyIndex);
     if (oldHash == null) {
       if (value == null) {
         return false; // no change, still null
       }
-      ebi.mutableNext(propertyIndex, next(json));
+      ebi.mutableNext(propertyIndex, next(json, value));
       return true;
     }
     // only perform compute of checksum/hash once (if checksum based)
@@ -92,9 +93,8 @@ public final class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
       }
       if (bean != null) {
         setValue(bean, value);
-        String json = reader.popJson();
-        if (json != null) {
-          final MutableValueInfo hash = createMutableInfo(json);
+        if (value != null) {
+          final MutableValueInfo hash = createMutableInfo(value);
           bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
         }
       }
@@ -110,10 +110,10 @@ public final class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
   public void setCacheDataValue(EntityBean bean, Object cacheData, PersistenceContext context) {
     if (cacheData instanceof String) {
       // parse back from string to support optimisation of java object serialisation
-      final String jsonContent = (String) cacheData;
-      final MutableValueInfo hash = createMutableInfo(jsonContent);
+      cacheData = scalarType.parse((String) cacheData);
+      final MutableValueInfo hash = createMutableInfo(cacheData);
       bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
-      cacheData = scalarType.parse(jsonContent);
+
     }
     setValue(bean, cacheData);
   }
@@ -150,9 +150,9 @@ public final class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
     private final ScalarType<?> parent;
     private final long checksum;
 
-    ChecksumMutableValue(ScalarType<?> parent, String json) {
+    ChecksumMutableValue(ScalarType<?> parent, Object value) {
       this.parent = parent;
-      this.checksum = Checksum.checksum(json);
+      this.checksum = Checksum.checksum(parent.format(value));
     }
 
     /**
@@ -185,33 +185,33 @@ public final class BeanPropertyJsonMapper extends BeanPropertyJsonBasic {
    */
   private static final class SourceMutableValue implements MutableValueInfo, MutableValueNext {
 
-    private final String originalJson;
+    private final String formattedJson;
     private final ScalarType<?> parent;
 
-    SourceMutableValue(ScalarType<?> parent, String json) {
+    SourceMutableValue(ScalarType<?> parent, Object value) {
       this.parent = parent;
-      this.originalJson = json;
+      this.formattedJson = parent.format(value);
     }
 
     @Override
     public MutableValueNext nextDirty(String json) {
-      return Objects.equals(originalJson, json) ? null : new SourceMutableValue(parent, json);
+      return Objects.equals(formattedJson, json) ? null : new SourceMutableValue(parent, parent.parse(json));
     }
 
     @Override
     public boolean isEqualToObject(Object obj) {
-      return Objects.equals(originalJson, parent.format(obj));
+      return Objects.equals(formattedJson, parent.format(obj));
     }
 
     @Override
     public Object get() {
       // rebuild the 'oldValue' for change log etc
-      return parent.parse(originalJson);
+      return parent.parse(formattedJson);
     }
 
     @Override
     public String content() {
-      return originalJson;
+      return formattedJson;
     }
 
     @Override

ebean-core/src/main/java/io/ebeaninternal/server/expression/SubQueryExpression.java

@@ -70,7 +70,7 @@ final class SubQueryExpression extends AbstractExpression implements Unsupported
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-    request.property(propName).append(op.expression).append('(').parse(sql).append(')');
+    request.property(propName).append(op.expression).append('(').append(sql).append(')');
   }
 
   @Override

ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonInsert.java

@@ -29,7 +29,7 @@ final class BindablePropertyJsonInsert extends BindableProperty {
       } else {
         // on insert store hash and push json
         final String json = prop.format(value);
-        final MutableValueInfo hash = prop.createMutableInfo(json);
+        final MutableValueInfo hash = prop.createMutableInfo(value);
         bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
         request.pushJson(json);
         request.bind(value, prop);

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java

@@ -3,7 +3,6 @@ package io.ebeaninternal.server.query;
 import io.ebean.*;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.SqlLimitRequest;
 import io.ebean.config.dbplatform.SqlLimitResponse;
 import io.ebean.config.dbplatform.SqlLimiter;
 import io.ebean.text.PathProperties;
@@ -518,7 +517,7 @@ final class CQueryBuilder {
     private final boolean distinct;
     private final boolean countSingleAttribute;
     private final String dbOrderBy;
-    private boolean useSqlLimiter;
+    private final boolean useSqlLimiter;
     private boolean hasWhere;
 
     private BuildReq(String selectClause, OrmQueryRequest<?> request, CQueryPredicates predicates, SqlTree select) {
@@ -535,13 +534,15 @@ final class CQueryBuilder {
       this.distinct = query.isDistinct() || select.isSqlDistinct();
       this.dbOrderBy = predicates.dbOrderBy();
       this.countSingleAttribute = query.isCountDistinct() && query.isSingleAttribute();
+      this.useSqlLimiter = selectClause == null
+        && query.hasMaxRowsOrFirstRow()
+        && (select.distinctOn() != null || select.manyProperty() == null || query.isSingleAttribute());
     }
 
     private void appendSelect() {
       if (selectClause != null) {
         sb.append(selectClause);
       } else {
-        useSqlLimiter = (query.hasMaxRowsOrFirstRow() && (select.manyProperty() == null || query.isSingleAttribute()));
         if (!useSqlLimiter) {
           appendSelectDistinct();
         }
@@ -566,7 +567,7 @@ final class CQueryBuilder {
         if (request.isInlineCountDistinct()) {
           sb.append(')');
         }
-        if (distinct && dbOrderBy != null) {
+        if (distinct && dbOrderBy != null && query.distinctOn() == null) {
           // add the orderBy columns to the select clause (due to distinct)
           String[] tokens = DbOrderByTrim.trim(dbOrderBy).split(",");
           for (String token : tokens) {
@@ -718,7 +719,7 @@ final class CQueryBuilder {
       }
       if (useSqlLimiter) {
         // use LIMIT/OFFSET, ROW_NUMBER() or rownum type SQL query limitation
-        SqlLimitRequest r = new OrmQueryLimitRequest(sb.toString(), dbOrderBy, query, dbPlatform, distinct);
+        var r = new OrmQueryLimitRequest(sb.toString(), dbOrderBy, query, dbPlatform, distinct, select.distinctOn(), hint(), inlineSqlComment());
         return sqlLimiter.limit(r);
       } else {
         if (updateStatement) {

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java

@@ -62,6 +62,7 @@ public final class CQueryPredicates {
    */
   private String dbFilterMany;
   private String dbOrderBy;
+  private String dbDistinctOn;
   private String dbUpdateClause;
   /**
    * Includes from where and order by clauses.
@@ -209,6 +210,10 @@ public final class CQueryPredicates {
       }
     }
     if (buildSql) {
+      final String distinctOn = query.distinctOn();
+      if (distinctOn != null) {
+        dbDistinctOn = deployParser.parse(distinctOn);
+      }
       predicateIncludes = deployParser.includes();
     }
   }
@@ -231,6 +236,9 @@ public final class CQueryPredicates {
     if (dbOrderBy != null) {
       dbOrderBy = alias.parse(dbOrderBy);
     }
+    if (dbDistinctOn != null) {
+      dbDistinctOn = alias.parse(dbDistinctOn);
+    }
   }
 
   private String parseOrderBy() {
@@ -351,6 +359,13 @@ public final class CQueryPredicates {
     return dbOrderBy;
   }
 
+  /**
+   * Return the db distinct on clause.
+   */
+  String dbDistinctOn() {
+    return dbDistinctOn;
+  }
+
   /**
    * Return the includes required for the where and order by clause.
    */

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java

@@ -59,6 +59,11 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
     return new DFetchGroup<>(detail);
   }
 
+  @Override
+  public Query<T> distinctOn(String distinctOn) {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public Query<T> select(String columns) {
     detail.select(columns);

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java

@@ -154,6 +154,10 @@ public final class SqlTreeBuilder {
   }
 
   private String buildDistinctOn() {
+    String distinctOn = predicates.dbDistinctOn();
+    if (distinctOn != null) {
+      return distinctOn;
+    }
     if (rawSql || !distinctOnPlatform || !sqlDistinct || Type.COUNT == query.type()) {
       return null;
     }

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -71,6 +71,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * Lazy loading batch size (can override server wide default).
    */
   private int lazyLoadBatchSize;
+  private String distinctOn;
   private OrderBy<T> orderBy;
   private String loadMode;
   private String loadDescription;
@@ -474,7 +475,10 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * Limit the number of fetch joins to Many properties, mark as query joins as needed.
    */
   private void markQueryJoins() {
-    detail.markQueryJoins(beanDescriptor, lazyLoadManyPath, isAllowOneManyFetch(), type.defaultSelect());
+    if (distinctOn == null) {
+      // no automatic join to query join conversion when distinctOn is used
+      detail.markQueryJoins(beanDescriptor, lazyLoadManyPath, isAllowOneManyFetch(), type.defaultSelect());
+    }
   }
 
   private boolean isAllowOneManyFetch() {
@@ -588,12 +592,11 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     return countDistinctOrder;
   }
 
-  /**
-   * Return true if the Id should be included in the query.
-   */
   @Override
   public final boolean isWithId() {
-    return !manualId && !distinct && !singleAttribute;
+    // distinctOn orm query will auto include the id property
+    // distinctOn dto query does NOT (via setting manualId to true)
+    return !manualId && !singleAttribute && (!distinct || distinctOn != null);
   }
 
   @Override
@@ -689,6 +692,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     copy.baseTable = baseTable;
     copy.rootTableAlias = rootTableAlias;
     copy.distinct = distinct;
+    copy.distinctOn = distinctOn;
     copy.allowLoadErrors = allowLoadErrors;
     copy.timeout = timeout;
     copy.mapKey = mapKey;
@@ -748,6 +752,11 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     this.type = type;
   }
 
+  @Override
+  public String distinctOn() {
+    return distinctOn;
+  }
+
   @Override
   public final String loadDescription() {
     return loadDescription;
@@ -1018,6 +1027,9 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     }
     if (distinct) {
       sb.append("/dt");
+      if (distinctOn != null) {
+        sb.append("/o:").append(distinctOn);
+      }
     }
     if (allowLoadErrors) {
       sb.append("/ae");
@@ -1271,6 +1283,13 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     detail.addNested(name, nestedDetail, config);
   }
 
+  @Override
+  public final Query<T> distinctOn(String distinctOn) {
+    this.distinctOn = distinctOn;
+    this.distinct = true;
+    return this;
+  }
+
   @Override
   public final Query<T> select(String columns) {
     detail.select(columns);

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java

@@ -11,13 +11,67 @@ public final class OrmQueryLimitRequest implements SqlLimitRequest {
   private final String sql;
   private final String sqlOrderBy;
   private final boolean distinct;
+  private final String distinctOn;
+  private final String hint;
+  private final String label;
 
   public OrmQueryLimitRequest(String sql, String sqlOrderBy, SpiQuery<?> ormQuery, DatabasePlatform dbPlatform, boolean distinct) {
+    this(sql, sqlOrderBy, ormQuery, dbPlatform, distinct, null, "", "");
+  }
+
+  public OrmQueryLimitRequest(String sql, String sqlOrderBy, SpiQuery<?> ormQuery, DatabasePlatform dbPlatform,
+                              boolean distinct, String distinctOn, String hint, String label) {
     this.sql = sql;
     this.sqlOrderBy = sqlOrderBy;
     this.ormQuery = ormQuery;
     this.dbPlatform = dbPlatform;
     this.distinct = distinct;
+    this.distinctOn = distinctOn;
+    this.hint = hint;
+    this.label  = label;
+  }
+
+  private StringBuilder newBuffer() {
+    return new StringBuilder(50 + sql.length());
+  }
+
+  @Override
+  public String ansiOffsetRows() {
+    final var buffer = selectDistinct();
+    buffer.append(sql);
+    int firstRow = getFirstRow();
+    if (firstRow > 0) {
+      buffer.append(" offset ").append(firstRow).append(" rows");
+    }
+    int maxRows = getMaxRows();
+    if (maxRows > 0) {
+      buffer.append(" fetch next ").append(maxRows).append(" rows only");
+    }
+    return buffer.toString();
+  }
+
+  @Override
+  public StringBuilder selectDistinct() {
+    final var buffer = newBuffer();
+    buffer.append("select ").append(hint).append(label);
+    if (distinct) {
+      buffer.append("distinct ");
+    }
+    return buffer;
+  }
+
+  @Override
+  public StringBuilder selectDistinctOnSql() {
+    var buffer = newBuffer();
+    buffer.append("select ").append(hint).append(label);
+    if (distinct) {
+      buffer.append("distinct ");
+      if (distinctOn != null) {
+        buffer.append("on (").append(distinctOn).append(") ");
+      }
+    }
+    buffer.append(sql);
+    return buffer;
   }
 
   @Override

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java

@@ -190,6 +190,9 @@ final class ScalarTypeJsonSet {
 
     @SuppressWarnings("unchecked")
     private Set convertList(List list) {
+      if (list == null) {
+        return null;
+      }
       return new LinkedHashSet(list);
     }
   }

ebean-core/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java

@@ -3,6 +3,7 @@ package io.ebeaninternal.server.querydefn;
 
 import io.ebean.*;
 import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.OrmQueryRequestTestHelper;
 import io.ebeaninternal.server.expression.BaseExpressionTest;
@@ -54,6 +55,32 @@ public class DefaultOrmQueryTest extends BaseExpressionTest {
     assertThat(q1.getId()).isEqualTo(42);
   }
 
+  @Test
+  void when_distinctOn_then_planChanges() {
+    DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) DB.find(Order.class).distinctOn("name");
+    DefaultOrmQuery<Order> q2 = (DefaultOrmQuery<Order>) DB.find(Order.class);
+
+    prepare(q1, q2);
+    assertThat(q1.createQueryPlanKey()).isNotEqualTo(q2.createQueryPlanKey());
+  }
+
+  @Test
+  void when_distinctOn_match() {
+    DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) DB.find(Order.class).distinctOn("name");
+    DefaultOrmQuery<Order> q2 = (DefaultOrmQuery<Order>) DB.find(Order.class).distinctOn("name");
+
+    prepare(q1, q2);
+    assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey());
+    assertThat(bindKey(q1)).isEqualTo(bindKey(q2));
+  }
+
+  @Test
+  void when_distinctOn_copy() {
+    DefaultOrmQuery<Order> q1 = (DefaultOrmQuery<Order>) DB.find(Order.class).distinctOn("name");
+    SpiQuery<Order> copy = q1.copy();
+    assertThat(copy.distinctOn()).isEqualTo("name");
+  }
+
   @Test
   public void when_addWhere_then_planChanges() {
 

ebean-ddl-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-jackson-mapper/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 

ebean-postgis-types/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -86,7 +86,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.1.0</tile>
+            <tile>io.ebean.tile:enhancement:14.3.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-querybean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,14 +63,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -100,7 +100,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.1.0</tile>
+            <tile>io.ebean.tile:enhancement:14.3.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-querybean/src/main/java/io/ebean/typequery/IQueryBean.java

@@ -55,6 +55,13 @@ public interface IQueryBean<T, R> extends QueryBuilder<R, T> {
    */
   FetchGroup<T> buildFetchGroup();
 
+  /**
+   * Set DISTINCT ON properties. This is a Postgres only SQL feature.
+   *
+   * @param properties The properties to include in the DISTINCT ON clause.
+   */
+  R distinctOn(TQProperty<R, ?>... properties);
+
   /**
    * Specify the properties to be loaded on the 'main' root level entity bean.
    * <p>

ebean-querybean/src/main/java/io/ebean/typequery/QueryBean.java

@@ -53,7 +53,7 @@ import java.util.stream.Stream;
  * @param <R> the specific root query bean type (e.g. QCustomer)
  */
 @NonNullApi
-public abstract class TQRootBean<T, R> implements IQueryBean<T, R> {
+public abstract class QueryBean<T, R> implements IQueryBean<T, R> {
 
   /**
    * The underlying query.
@@ -73,21 +73,21 @@ public abstract class TQRootBean<T, R> implements IQueryBean<T, R> {
   /**
    * Construct using the type of bean to query on and the default database.
    */
-  public TQRootBean(Class<T> beanType) {
+  public QueryBean(Class<T> beanType) {
     this(beanType, DB.getDefault());
   }
 
   /**
    * Construct using the type of bean to query on and a given database.
    */
-  public TQRootBean(Class<T> beanType, Database database) {
+  public QueryBean(Class<T> beanType, Database database) {
     this(database.find(beanType));
   }
 
   /**
    * Construct with a transaction.
    */
-  protected TQRootBean(Class<T> beanType, Transaction transaction) {
+  protected QueryBean(Class<T> beanType, Transaction transaction) {
     this(beanType);
     query.usingTransaction(transaction);
   }
@@ -95,7 +95,7 @@ public abstract class TQRootBean<T, R> implements IQueryBean<T, R> {
   /**
    * Construct with a database and transaction.
    */
-  protected TQRootBean(Class<T> beanType, Database database, Transaction transaction) {
+  protected QueryBean(Class<T> beanType, Database database, Transaction transaction) {
     this(beanType, database);
     query.usingTransaction(transaction);
   }
@@ -104,7 +104,7 @@ public abstract class TQRootBean<T, R> implements IQueryBean<T, R> {
    * Construct using a query.
    */
   @SuppressWarnings("unchecked")
-  public TQRootBean(Query<T> query) {
+  public QueryBean(Query<T> query) {
     this.query = query;
     this.root = (R) this;
   }
@@ -114,13 +114,13 @@ public abstract class TQRootBean<T, R> implements IQueryBean<T, R> {
    * values for select() and fetch().
    */
   @SuppressWarnings("unchecked")
-  public TQRootBean(boolean aliasDummy) {
+  public QueryBean(boolean aliasDummy) {
     this.query = null;
     this.root = (R) this;
   }
 
   /** Construct for FilterMany */
-  protected TQRootBean(ExpressionList<T> filter) {
+  protected QueryBean(ExpressionList<T> filter) {
     this.query = null;
     this.root = null;
     this.whereStack = new ArrayStack<>();
@@ -144,6 +144,12 @@ public abstract class TQRootBean<T, R> implements IQueryBean<T, R> {
     return query;
   }
 
+  @Override
+  public R distinctOn(String distinctOn) {
+    query.distinctOn(distinctOn);
+    return root;
+  }
+
   @Override
   public R select(String properties) {
     query.select(properties);
@@ -156,6 +162,17 @@ public abstract class TQRootBean<T, R> implements IQueryBean<T, R> {
     return root;
   }
 
+  @Override
+  @SafeVarargs
+  public final R distinctOn(TQProperty<R, ?>... properties) {
+    final var joiner = new StringJoiner(", ");
+    for (Query.Property<?> property : properties) {
+      joiner.add(property.toString());
+    }
+    distinctOn(joiner.toString());
+    return root;
+  }
+
   @Override
   @SafeVarargs
   public final R select(TQProperty<R, ?>... properties) {

ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java

@@ -46,7 +46,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Eagerly fetch this association fetching all the properties.
    */
   public final R fetch() {
-    ((TQRootBean) _root).query().fetch(_name);
+    ((QueryBean) _root).query().fetch(_name);
     return _root;
   }
 
@@ -54,7 +54,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Eagerly fetch this association using a "query join".
    */
   public final R fetchQuery() {
-    ((TQRootBean) _root).query().fetchQuery(_name);
+    ((QueryBean) _root).query().fetchQuery(_name);
     return _root;
   }
 
@@ -63,7 +63,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Cache misses are populated via fetchQuery().
    */
   public final R fetchCache() {
-    ((TQRootBean) _root).query().fetchCache(_name);
+    ((QueryBean) _root).query().fetchCache(_name);
     return _root;
   }
 
@@ -71,7 +71,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Use lazy loading for fetching this association.
    */
   public final R fetchLazy() {
-    ((TQRootBean) _root).query().fetchLazy(_name);
+    ((QueryBean) _root).query().fetchLazy(_name);
     return _root;
   }
 
@@ -79,7 +79,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Eagerly fetch this association with the properties specified.
    */
   public final R fetch(String properties) {
-    ((TQRootBean) _root).query().fetch(_name, properties);
+    ((QueryBean) _root).query().fetch(_name, properties);
     return _root;
   }
 
@@ -87,7 +87,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Eagerly fetch this association using a "query join" with the properties specified.
    */
   public final R fetchQuery(String properties) {
-    ((TQRootBean) _root).query().fetchQuery(_name, properties);
+    ((QueryBean) _root).query().fetchQuery(_name, properties);
     return _root;
   }
 
@@ -96,7 +96,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Cache misses are populated via  fetchQuery().
    */
   public final R fetchCache(String properties) {
-    ((TQRootBean) _root).query().fetchCache(_name, properties);
+    ((QueryBean) _root).query().fetchCache(_name, properties);
     return _root;
   }
 
@@ -177,7 +177,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
   }
 
   private SpiQueryFetch spiQuery() {
-    return (SpiQueryFetch) ((TQRootBean) _root).query();
+    return (SpiQueryFetch) ((QueryBean) _root).query();
   }
 
   private Set<String> properties(TQProperty<?, ?>... props) {

ebean-querybean/src/main/java/io/ebean/typequery/TQProperty.java

@@ -41,7 +41,7 @@ public class TQProperty<R, T> implements Query.Property<T> {
    * Internal method to return the underlying expression list.
    */
   protected final ExpressionList<?> expr() {
-    return ((TQRootBean<?, ?>) _root).peekExprList();
+    return ((QueryBean<?, ?>) _root).peekExprList();
   }
 
   /**

ebean-querybean/src/test/java/org/querytest/QCustomerTest.java

@@ -4,6 +4,7 @@ import io.ebean.*;
 import io.ebean.annotation.Transactional;
 import io.ebean.test.LoggedSql;
 import io.ebean.types.Inet;
+import io.ebeaninternal.api.SpiQuery;
 import org.example.domain.Address;
 import org.example.domain.Country;
 import org.example.domain.Customer;
@@ -226,6 +227,22 @@ public class QCustomerTest {
       .findList();
   }
 
+  @Test
+  public void distinctOn() {
+    var c = QContact.alias();
+    var q = new QContact()
+      .distinctOn(c.customer)
+      .select(c.lastName, c.whenCreated)
+      .orderBy()
+      .customer.id.asc()
+      .whenCreated.desc()
+      .query();
+
+    SpiQuery<?> spiQuery = (SpiQuery<?>) q;
+    assertThat(spiQuery.distinctOn()).isEqualTo("customer");
+    assertThat(spiQuery.isDistinct()).isTrue();
+  }
+
   @Transactional
   @Test
   public void forUpdate() {
@@ -314,7 +331,7 @@ public class QCustomerTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select t0.id, t0.name from be_customer t0 limit 10");
+    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterManySeparateQuery */ t0.id, t0.name from be_customer t0 limit 10");
   }
 
   @Test

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,28 +22,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -72,7 +72,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.1.0</tile>
+            <tile>io.ebean.tile:enhancement:14.3.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-spring-txn/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -99,7 +99,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.1.0</tile>
+            <tile>io.ebean.tile:enhancement:14.3.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -12,7 +12,7 @@
   <artifactId>ebean-test</artifactId>
 
   <properties>
-    <bytebuddy.version>1.14.12</bytebuddy.version>
+    <bytebuddy.version>1.14.13</bytebuddy.version>
     <assertj.version>3.25.3</assertj.version>
   </properties>
 
@@ -33,20 +33,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -149,14 +149,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -293,7 +293,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
       <scope>provided</scope>
     </dependency>
 
@@ -305,11 +305,11 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.34</version>
+        <version>2.40</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.1.0</tile>
+            <tile>io.ebean.tile:enhancement:14.3.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java

@@ -222,8 +222,12 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     LoggedSql.start();
 
     DtoQuery<ContactDto> query = DB.find(Contact.class)
-      .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
-      .isNotNull("lastName").order().asc("lastName").asDto(ContactDto.class);
+      .select("email, " + concat("lastName", ", ", "firstName") + " as fullName")
+      .where()
+      .isNotNull("email")
+      .isNotNull("lastName")
+      .order().asc("lastName")
+      .asDto(ContactDto.class);
 
     List<ContactDto> dtos = query.findList();
 
@@ -246,9 +250,15 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
 
     LoggedSql.start();
 
-    List<ContactDto> contactDtos = DB.find(Contact.class).setLabel("emailFullName")
-      .select("email, " + concat("lastName", ", ", "firstName") + " as fullName").where().isNotNull("email")
-      .isNotNull("lastName").order().asc("lastName").setMaxRows(10).asDto(ContactDto.class).findList();
+    List<ContactDto> contactDtos = DB.find(Contact.class)
+      .setLabel("emailFullName")
+      .select("email, " + concat("lastName", ", ", "firstName") + " as fullName")
+      .where().isNotNull("email")
+      .isNotNull("lastName")
+      .orderBy().asc("lastName")
+      .setMaxRows(10)
+      .asDto(ContactDto.class)
+      .findList();
 
     assertThat(contactDtos).isNotEmpty();
 
@@ -260,11 +270,11 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     List<String> sql = LoggedSql.stop();
 
     if (isSqlServer()) {
-      assertSql(sql.get(0)).contains("select top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+      assertSql(sql.get(0)).contains("select /* emailFullName */ top 10 t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
         + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
 
     } else {
-      assertSql(sql.get(0)).contains("select t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
+      assertSql(sql.get(0)).contains("select /* emailFullName */ t0.email, " + concat("t0.last_name", ", ", "t0.first_name")
         + " fullName from contact t0 where t0.email is not null and t0.last_name is not null order by t0.last_name");
     }
   }

ebean-test/src/test/java/org/tests/cascade/TestLazyLoadMany.java

@@ -18,6 +18,7 @@ class TestLazyLoadMany extends BaseTestCase {
     }
     return m0;
   }
+
   @Test
   void loadAfterPCCleared() {
 
@@ -31,6 +32,7 @@ class TestLazyLoadMany extends BaseTestCase {
       List<COOne> children = DB.find(COOne.class)
         .setLazyLoadBatchSize(2)
         .where().startsWith("name", "tll-m")
+        .orderBy("name")
         .findList();
 
       assertThat(children).hasSize(3);

ebean-test/src/test/java/org/tests/query/TestDistinctOnQuery.java

@@ -0,0 +1,187 @@
+package org.tests.query;
+
+import io.ebean.DB;
+import io.ebean.Query;
+import io.ebean.annotation.Platform;
+import io.ebean.test.LoggedSql;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.ForPlatform;
+import org.junit.jupiter.api.Test;
+import org.tests.model.basic.Contact;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.OrderDetail;
+import org.tests.model.basic.ResetBasicData;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class TestDistinctOnQuery extends BaseTestCase {
+
+  @ForPlatform({Platform.POSTGRES, Platform.YUGABYTE})
+  @Test
+  void distinctOn() {
+    ResetBasicData.reset();
+
+    LoggedSql.start();
+
+    List<Customer> customers = DB.find(Customer.class)
+      .distinctOn("id")
+      .select("name")
+      .fetch("contacts", "firstName, lastName")
+      .orderBy("id, contacts.lastName")
+      .setMaxRows(10)
+      .findList();
+
+    for (Customer customer : customers) {
+      List<Contact> contacts = customer.getContacts();
+      assertThat(contacts.size()).isEqualTo(1);
+    }
+
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select distinct on (t0.id) t0.id, t0.name, t1.id, t1.first_name, t1.last_name from o_customer t0 left join contact t1 on t1.customer_id = t0.id order by t0.id, t1.last_name limit 10;");
+  }
+
+  @ForPlatform({Platform.POSTGRES, Platform.YUGABYTE})
+  @Test
+  void distinctOnSubQuery() {
+    ResetBasicData.reset();
+
+    LoggedSql.start();
+
+    Query<OrderDetail> subQuery = DB.find(OrderDetail.class)
+      .distinctOn("product")
+      .select("id")
+      .orderBy("product, updtime desc")
+      .setMaxRows(10);
+
+    List<OrderDetail> lines = DB.find(OrderDetail.class)
+      .select("product, orderQty, shipQty, created")
+      .where().in("id", subQuery)
+      .orderBy().asc("cretime")
+      .findList();
+
+    assertThat(lines).isNotEmpty();
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select t0.id, t0.product_id, t0.order_qty, t0.ship_qty, t0.id from o_order_detail t0 where t0.id in (select distinct on (t0.product_id) t0.id from o_order_detail t0 order by t0.product_id, t0.updtime desc limit 10) order by t0.cretime");
+  }
+
+  @ForPlatform({Platform.POSTGRES, Platform.YUGABYTE})
+  @Test
+  void distinctOnManyToOne() {
+    ResetBasicData.reset();
+    int totalCount = DB.find(Contact.class).findCount();
+
+    LoggedSql.start();
+    List<Contact> contacts = DB.find(Contact.class)
+      .distinctOn("customer")
+      .select("*")
+      .orderBy("customer, updtime desc")
+      .setMaxRows(10)
+      .findList();
+
+    assertThat(contacts.size()).isLessThan(totalCount);
+
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select distinct on (t0.customer_id) t0.id, t0.first_name, t0.last_name");
+    assertThat(sql.get(0)).contains("from contact t0 order by t0.customer_id, t0.updtime desc limit 10");
+  }
+
+  @ForPlatform({Platform.POSTGRES, Platform.YUGABYTE})
+  @Test
+  void distinctOnToDto() {
+    ResetBasicData.reset();
+    int totalCount = DB.find(Contact.class).findCount();
+
+    LoggedSql.start();
+    List<MyDto> contacts = DB.find(Contact.class)
+      .distinctOn("lastName")
+      .select("firstName, lastName")
+      .orderBy("lastName desc")
+      .setMaxRows(10)
+      .asDto(MyDto.class)
+      .findList();
+
+    assertThat(contacts.size()).isLessThan(totalCount);
+    for (MyDto contact : contacts) {
+      assertThat(contact.firstName()).isNotBlank();
+      assertThat(contact.lastName()).isNotBlank();
+    }
+
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select distinct on (t0.last_name) t0.first_name, t0.last_name from contact t0 order by t0.last_name desc limit 10");
+  }
+
+  @ForPlatform({Platform.POSTGRES, Platform.YUGABYTE})
+  @Test
+  void distinctOnToDtoWithId() {
+    ResetBasicData.reset();
+    int totalCount = DB.find(Contact.class).findCount();
+
+    LoggedSql.start();
+    List<MyDtoWithId> contacts = DB.find(Contact.class)
+      .distinctOn("lastName")
+      .select("id, firstName, lastName")
+      .orderBy("lastName desc")
+      .setMaxRows(10)
+      .asDto(MyDtoWithId.class)
+      .findList();
+
+    assertThat(contacts.size()).isLessThan(totalCount);
+    for (MyDtoWithId contact : contacts) {
+      assertThat(contact.id()).isGreaterThan(0);
+      assertThat(contact.firstName()).isNotBlank();
+      assertThat(contact.lastName()).isNotBlank();
+    }
+
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(1);
+    assertThat(sql.get(0)).contains("select distinct on (t0.last_name) t0.id, t0.first_name, t0.last_name from contact t0 order by t0.last_name desc limit 10");
+  }
+
+  public static class MyDto {
+    private final String firstName;
+    private final String lastName;
+
+    public MyDto(String firstName, String lastName) {
+      this.firstName = firstName;
+      this.lastName = lastName;
+    }
+
+    public String firstName() {
+      return firstName;
+    }
+
+    public String lastName() {
+      return lastName;
+    }
+  }
+
+  public static class MyDtoWithId {
+    private final long id;
+    private final String firstName;
+    private final String lastName;
+
+    public MyDtoWithId(long id, String firstName, String lastName) {
+      this.id = id;
+      this.firstName = firstName;
+      this.lastName = lastName;
+    }
+
+    public long id() {
+      return id;
+    }
+
+    public String firstName() {
+      return firstName;
+    }
+
+    public String lastName() {
+      return lastName;
+    }
+  }
+}

howto-deploy-to-central.md

@@ -15,8 +15,8 @@ mvn -T 4 clean package
 mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests -DskipStagingRepositoryClose=true -DstagingProgressTimeoutMinutes=9
 
 ## git commit, git tag, git push --tags
-git commit -am 'Version 14.1.0'
-git tag 14.0.2
+git commit -am 'Version 14.3.0'
+git tag 14.3.0
 git push --tags
 
 ## convert to javax

kotlin-querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -56,14 +56,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 

kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java

@@ -337,7 +337,7 @@ class SimpleQueryBeanWriter {
       writer.append(" */").eol();
       writer.append(Constants.AT_GENERATED).eol();
       writer.append(Constants.AT_TYPEQUERYBEAN).eol();
-      writer.append("class Q%s : io.ebean.typequery.TQRootBean<%s, Q%s> {", shortName, beanFullName, shortName).eol();
+      writer.append("class Q%s : io.ebean.typequery.QueryBean<%s, Q%s> {", shortName, beanFullName, shortName).eol();
     }
 
     writer.eol();

platforms/all/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,67 +15,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/h2/pom.xml

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

platforms/hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/hsqldb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,13 +15,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/oracle/src/main/java/io/ebean/platform/oracle/OracleAnsiSqlRowsLimiter.java

@@ -11,23 +11,8 @@ final class OracleAnsiSqlRowsLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-    String dbSql = request.getDbSql();
-    StringBuilder sb = new StringBuilder(50 + dbSql.length());
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append(dbSql);
-    int firstRow = request.getFirstRow();
-    if (firstRow > 0) {
-      sb.append(" offset ").append(firstRow).append(" rows");
-    }
-    int maxRows = request.getMaxRows();
-    if (maxRows > 0) {
-      sb.append(" fetch next ").append(maxRows).append(" rows only");
-    }
     // Oracle does not support FOR UPDATE clause with limit offset
-    return new SqlLimitResponse(sb.toString());
+    return new SqlLimitResponse(request.ansiOffsetRows());
   }
 
 }

platforms/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <artifactId>platforms</artifactId>

platforms/postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>

platforms/sqlanywhere/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
   </dependencies>

platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerSqlLimiter.java

@@ -11,31 +11,23 @@ final class SqlServerSqlLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-    String dbSql = request.getDbSql();
-    StringBuilder sb = new StringBuilder(50 + dbSql.length());
     int firstRow = request.getFirstRow();
     int maxRows = request.getMaxRows();
     if (firstRow < 1) {
       // just use top n
-      sb.append("select ");
-      if (request.isDistinct()) {
-        sb.append("distinct ");
-      }
-      sb.append("top ").append(maxRows).append(' ');
-      sb.append(dbSql);
-      return new SqlLimitResponse(sb.toString());
+      final var buffer = request.selectDistinct();
+      buffer.append("top ").append(maxRows).append(' ');
+      buffer.append(request.getDbSql());
+      return new SqlLimitResponse(buffer.toString());
     }
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append(dbSql);
-    sb.append(' ').append("offset");
-    sb.append(' ').append(firstRow).append(" rows");
+    final var buffer = request.selectDistinct();
+    buffer.append(request.getDbSql());
+    buffer.append(' ').append("offset");
+    buffer.append(' ').append(firstRow).append(" rows");
     if (maxRows > 0) {
-      sb.append(" fetch next ").append(maxRows).append(" rows only");
+      buffer.append(" fetch next ").append(maxRows).append(" rows only");
     }
-    return new SqlLimitResponse(sb.toString());
+    return new SqlLimitResponse(buffer.toString());
   }
 
 }

pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>3.12</version>
+    <version>4.1</version>
   </parent>
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>14.1.0</version>
+  <version>14.3.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -51,10 +51,10 @@
     <ebean-ddl-runner.version>2.3</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
     <ebean-migration.version>14.0.0</ebean-migration.version>
-    <ebean-test-containers.version>7.3</ebean-test-containers.version>
-    <ebean-datasource.version>8.12</ebean-datasource.version>
-    <ebean-agent.version>14.1.0</ebean-agent.version>
-    <ebean-maven-plugin.version>14.1.0</ebean-maven-plugin.version>
+    <ebean-test-containers.version>7.4</ebean-test-containers.version>
+    <ebean-datasource.version>8.14</ebean-datasource.version>
+    <ebean-agent.version>14.3.0</ebean-agent.version>
+    <ebean-maven-plugin.version>14.3.0</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
       <scope>test</scope>
     </dependency>
 

querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <name>querybean generator</name>

querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java

@@ -225,7 +225,7 @@ class SimpleQueryBeanWriter {
       writer.append("public final class Q%s {", shortName).eol();
     } else {
       writer.append(Constants.AT_TYPEQUERYBEAN).eol();
-      writer.append("public final class Q%s extends io.ebean.typequery.TQRootBean<%s,Q%s> {", shortName, beanFullName, shortName).eol();
+      writer.append("public final class Q%s extends io.ebean.typequery.QueryBean<%s,Q%s> {", shortName, beanFullName, shortName).eol();
     }
     writer.eol();
   }

tests/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <artifactId>tests</artifactId>

tests/test-java16/pom.xml

@@ -5,20 +5,20 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <artifactId>test-java16</artifactId>
 
   <properties>
-    <java.release>16</java.release>
+    <maven.compiler.release>17</maven.compiler.release>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
@@ -30,14 +30,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -52,7 +52,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.1.0</tile>
+            <tile>io.ebean.tile:enhancement:14.3.0</tile>
           </tiles>
         </configuration>
       </plugin>

tests/test-kotlin/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.3.0</version>
   </parent>
 
   <artifactId>test-kotlin</artifactId>
@@ -40,20 +40,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.1.0</version>
+      <version>14.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -92,7 +92,7 @@
                   <groupId>io.ebean</groupId>
                   <artifactId>kotlin-querybean-generator</artifactId>
 <!--                  <artifactId>querybean-generator</artifactId>-->
-                  <version>14.0.2</version>
+                  <version>14.3.0</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>
             </configuration>