Fix for #3381 - Empty OneToMany when overflowing LazyLoadBatchSize and mixed queries

14.0.0 via #3295 introduced this bug.

 #3295 introduced a behaviour where bulk updates clear the persistence context. Now the lazy loading of a BeanCollection works with an assumption that the "parent bean" is in the persistence context (and this assumption is broken with that change for this test case). That is, the bulk update is clearing the persistence context - removing the parent bean BEFORE the lazy loading is invoked ... and that doesn't then work because the parent bean isn't in the persistence context.

 This fix means that when lazy loading many's, the parent beans are putIfAbsent into the persistence context.

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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -60,13 +60,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</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.0.2</version>
   </parent>
 
   <name>ebean api</name>

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

@@ -222,8 +222,6 @@ public interface ExpressionList<T> {
   int delete();
 
   /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then delete().
-   * <p>
    * Execute as a delete query deleting the 'root level' beans that match the predicates
    * in the query.
    * <p>
@@ -233,7 +231,6 @@ public interface ExpressionList<T> {
    *
    * @return the number of rows that were deleted.
    */
-  @Deprecated(forRemoval = true, since = "13.1.0")
   int delete(Transaction transaction);
 
   /**
@@ -245,14 +242,11 @@ public interface ExpressionList<T> {
   int update();
 
   /**
-   * @deprecated migrate to {@link #usingTransaction(Transaction)} then update().
-   * <p>
    * Execute as a update query with the given transaction.
    *
    * @return the number of rows that were updated.
    * @see UpdateQuery
    */
-  @Deprecated(forRemoval = true, since = "13.1.0")
   int update(Transaction transaction);
 
   /**

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

@@ -1,975 +0,0 @@
-package io.ebean;
-
-import io.avaje.lang.Nullable;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.Timestamp;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BooleanSupplier;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * Build and execute an ORM query.
- *
- * @param <SELF> The type of the builder
- * @param <T>    The entity bean type
- */
-public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
-
-  /**
-   * Set root table alias.
-   */
-  SELF alias(String alias);
-
-  /**
-   * Apply changes to the query conditional on the supplied predicate.
-   * <p>
-   * Typically, the changes are extra predicates etc.
-   *
-   * @param predicate The predicate which when true the changes are applied
-   * @param apply     The changes to apply to the query
-   */
-  SELF alsoIf(BooleanSupplier predicate, Consumer<SELF> apply);
-
-  /**
-   * Perform an 'As of' query using history tables to return the object graph
-   * as of a time in the past.
-   * <p>
-   * To perform this query the DB must have underlying history tables.
-   *
-   * @param asOf the date time in the past at which you want to view the data
-   */
-  SELF asOf(Timestamp asOf);
-
-  /**
-   * Execute the query against the draft set of tables.
-   */
-  SELF asDraft();
-
-  /**
-   * Convert the query to a DTO bean query.
-   * <p>
-   * We effectively use the underlying ORM query to build the SQL and then execute
-   * and map it into DTO beans.
-   */
-  <D> DtoQuery<D> asDto(Class<D> dtoClass);
-
-  /**
-   * Convert the query to a UpdateQuery.
-   * <p>
-   * Typically this is used with query beans to covert a query bean
-   * query into an UpdateQuery like the examples below.
-   * </p>
-   *
-   * <pre>{@code
-   *
-   *  int rowsUpdated = new QCustomer()
-   *       .name.startsWith("Rob")
-   *       .asUpdate()
-   *       .set("active", false)
-   *       .update();;
-   *
-   * }</pre>
-   *
-   * <pre>{@code
-   *
-   *   int rowsUpdated = new QContact()
-   *       .notes.note.startsWith("Make Inactive")
-   *       .email.endsWith("@foo.com")
-   *       .customer.id.equalTo(42)
-   *       .asUpdate()
-   *       .set("inactive", true)
-   *       .setRaw("email = lower(email)")
-   *       .update();
-   *
-   * }</pre>
-   */
-  UpdateQuery<T> asUpdate();
-
-  /**
-   * Return a copy of the query.
-   * <p>
-   * This is so that you can use a Query as a "prototype" for creating other
-   * query instances. You could create a Query with various where expressions
-   * and use that as a "prototype" - using this copy() method to create a new
-   * instance that you can then add other expressions then execute.
-   * </p>
-   */
-  SELF copy();
-
-  /**
-   * Execute the query using the given transaction.
-   */
-  SELF usingTransaction(Transaction transaction);
-
-  /**
-   * Execute the query using the given connection.
-   */
-  SELF usingConnection(Connection connection);
-
-  /**
-   * Execute the query using the given database.
-   */
-  SELF usingDatabase(Database database);
-
-  /**
-   * Ensure that the master DataSource is used if there is a read only data source
-   * being used (that is using a read replica database potentially with replication lag).
-   * <p>
-   * When the database is configured with a read-only DataSource via
-   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
-   * by default when a query is run without an active transaction, it uses the read-only data
-   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
-   * against the master data source.
-   */
-  SELF usingMaster();
-
-  /**
-   * Set the base table to use for this query.
-   * <p>
-   * Typically this is used when a table has partitioning and we wish to specify a specific
-   * partition/table to query against.
-   * </p>
-   * <pre>{@code
-   *
-   *   QOrder()
-   *   .setBaseTable("order_2019_05")
-   *   .status.equalTo(Status.NEW)
-   *   .findList();
-   *
-   * }</pre>
-   */
-  SELF setBaseTable(String baseTable);
-
-  /**
-   * Specify the PersistenceContextScope to use for this query.
-   * <p>
-   * When this is not set the 'default' configured on {@link io.ebean.config.DatabaseConfig#setPersistenceContextScope(PersistenceContextScope)}
-   * is used - this value defaults to {@link PersistenceContextScope#TRANSACTION}.
-   * <p>
-   * Note that the same persistence Context is used for subsequent lazy loading and query join queries.
-   * <p>
-   * Note that #findEach uses a 'per object graph' PersistenceContext so this scope is ignored for
-   * queries executed as #findIterate, #findEach, #findEachWhile.
-   *
-   * @param scope The scope to use for this query and subsequent lazy loading.
-   */
-  SELF setPersistenceContextScope(PersistenceContextScope scope);
-
-  /**
-   * Explicitly specify whether to use AutoTune for this query.
-   * <p>
-   * If you do not call this method on a query the "Implicit AutoTune mode" is
-   * used to determine if AutoTune should be used for a given query.
-   * <p>
-   * AutoTune can add additional fetch paths to the query and specify which
-   * properties are included for each path. If you have explicitly defined some
-   * fetch paths AutoTune will not remove them.
-   */
-  SELF setAutoTune(boolean autoTune);
-
-  /**
-   * Execute the query allowing properties with invalid JSON to be collected and not fail the query.
-   * <pre>{@code
-   *
-   *   // fetch a bean with JSON content
-   *   EBasicJsonList bean= DB.find(EBasicJsonList.class)
-   *       .setId(42)
-   *       .setAllowLoadErrors()  // collect errors into bean state if we have invalid JSON
-   *       .findOne();
-   *
-   *
-   *   // get the invalid JSON errors from the bean state
-   *   Map<String, Exception> errors = server().getBeanState(bean).getLoadErrors();
-   *
-   *   // If this map is not empty tell we have invalid JSON
-   *   // and should try and fix the JSON content or inform the user
-   *
-   * }</pre>
-   */
-  SELF setAllowLoadErrors();
-
-  /**
-   * Set the default lazy loading batch size to use.
-   * <p>
-   * When lazy loading is invoked on beans loaded by this query then this sets the
-   * batch size used to load those beans.
-   *
-   * @param lazyLoadBatchSize the number of beans to lazy load in a single batch
-   */
-  SELF setLazyLoadBatchSize(int lazyLoadBatchSize);
-
-  /**
-   * Set a label on the query.
-   * <p>
-   * This label can be used to help identify query performance metrics but we can also use
-   * profile location enhancement on Finders so for some that would be a better option.
-   */
-  SELF setLabel(String label);
-
-  /**
-   * Set a SQL query hint.
-   * <p>
-   * This results in an inline comment that immediately follows
-   * after the select keyword in the form: {@code /*+ hint *\/ }
-   */
-  SELF setHint(String hint);
-
-  /**
-   * Set the index(es) to search for a document store which uses partitions.
-   * <p>
-   * For example, when executing a query against ElasticSearch with daily indexes we can
-   * explicitly specify the indexes to search against.
-   * </p>
-   * <pre>{@code
-   *
-   *   // explicitly specify the indexes to search
-   *   query.setDocIndexName("logstash-2016.11.5,logstash-2016.11.6")
-   *
-   *   // search today's index
-   *   query.setDocIndexName("$today")
-   *
-   *   // search the last 3 days
-   *   query.setDocIndexName("$last-3")
-   *
-   * }</pre>
-   * <p>
-   * If the indexName is specified with ${daily} e.g. "logstash-${daily}" ... then we can use
-   * $today and $last-x as the search docIndexName like the examples below.
-   * </p>
-   * <pre>{@code
-   *
-   *   // search today's index
-   *   query.setDocIndexName("$today")
-   *
-   *   // search the last 3 days
-   *   query.setDocIndexName("$last-3")
-   *
-   * }</pre>
-   *
-   * @param indexName The index or indexes to search against
-   * @return This query
-   */
-  SELF setDocIndexName(String indexName);
-
-  /**
-   * Execute the query including soft deleted rows.
-   * <p>
-   * This means that Ebean will not add any predicates to the query for filtering out
-   * soft deleted rows. You can still add your own predicates for the deleted properties
-   * and effectively you have full control over the query to include or exclude soft deleted
-   * rows as needed for a given use case.
-   */
-  SELF setIncludeSoftDeletes();
-
-  /**
-   * Disable read auditing for this query.
-   * <p>
-   * This is intended to be used when the query is not a user initiated query and instead
-   * part of the internal processing in an application to load a cache or document store etc.
-   * In these cases we don't want the query to be part of read auditing.
-   */
-  SELF setDisableReadAuditing();
-
-  /**
-   * Set true if you want to disable lazy loading.
-   * <p>
-   * That is, once the object graph is returned further lazy loading is disabled.
-   */
-  SELF setDisableLazyLoading(boolean disableLazyLoading);
-
-  /**
-   * Set whether this query uses DISTINCT.
-   */
-  SELF setDistinct(boolean distinct);
-
-  /**
-   * Restrict the query to only return subtypes of the given inherit type.
-   * <pre>{@code
-   *
-   *   List<Animal> animals =
-   *     new QAnimal()
-   *       .name.startsWith("Fluffy")
-   *       .setInheritType(Cat.class)
-   *       .findList();
-   *
-   * }</pre>
-   */
-  SELF setInheritType(Class<? extends T> type);
-
-  /**
-   * Set the first row to return for this query.
-   *
-   * @param firstRow the first row to include in the query result.
-   */
-  SELF setFirstRow(int firstRow);
-
-  /**
-   * Set the maximum number of rows to return in the query.
-   *
-   * @param maxRows the maximum number of rows to return in the query.
-   */
-  SELF setMaxRows(int maxRows);
-
-  /**
-   * Set RawSql to use for this query.
-   */
-  SELF setRawSql(RawSql rawSql);
-
-  /**
-   * Extended version for setDistinct in conjunction with "findSingleAttributeList";
-   *
-   * <pre>{@code
-   *
-   *  List<CountedValue<Order.Status>> orderStatusCount =
-   *
-   *     DB.find(Order.class)
-   *      .select("status")
-   *      .where()
-   *      .gt("orderDate", LocalDate.now().minusMonths(3))
-   *
-   *      // fetch as single attribute with a COUNT
-   *      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
-   *      .findSingleAttributeList();
-   *
-   *     for (CountedValue<Order.Status> entry : orderStatusCount) {
-   *       System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
-   *     }
-   *
-   *   // produces
-   *
-   *   count:3 orderStatus:NEW
-   *   count:1 orderStatus:SHIPPED
-   *   count:1 orderStatus:COMPLETE
-   *
-   * }</pre>
-   */
-  SELF setCountDistinct(CountDistinctOrder orderBy);
-
-  /**
-   * Set the property to use as keys for a map.
-   * <p>
-   * If no property is set then the id property is used.
-   * </p>
-   * <pre>{@code
-   *
-   * // Assuming sku is unique for products...
-   *
-   * Map<String,Product> productMap = DB.find(Product.class)
-   *     .setMapKey("sku")  // sku map keys...
-   *     .findMap();
-   *
-   * }</pre>
-   *
-   * @param mapKey the property to use as keys for a map.
-   */
-  SELF setMapKey(String mapKey);
-
-  /**
-   * Set to true if this query should execute against the doc store.
-   * <p>
-   * When setting this you may also consider disabling lazy loading.
-   */
-  SELF setUseDocStore(boolean useDocStore);
-
-  /**
-   * When set to true when you want the returned beans to be read only.
-   */
-  SELF setReadOnly(boolean readOnly);
-
-  /**
-   * Set a timeout on this query.
-   * <p>
-   * This will typically result in a call to setQueryTimeout() on a
-   * preparedStatement. If the timeout occurs an exception will be thrown - this
-   * will be a SQLException wrapped up in a PersistenceException.
-   * </p>
-   *
-   * @param secs the query timeout limit in seconds. Zero means there is no limit.
-   */
-  SELF setTimeout(int secs);
-
-  /**
-   * A hint which for JDBC translates to the Statement.fetchSize().
-   * <p>
-   * Gives the JDBC driver a hint as to the number of rows that should be
-   * fetched from the database when more rows are needed for ResultSet.
-   * </p>
-   * <p>
-   * Note that internally findEach and findEachWhile will set the fetch size
-   * if it has not already as these queries expect to process a lot of rows.
-   * If we didn't then Postgres and MySql for example would eagerly pull back
-   * all the row data and potentially consume a lot of memory in the process.
-   * </p>
-   * <p>
-   * As findEach and findEachWhile automatically set the fetch size we don't have
-   * to do so generally but we might still wish to for tuning a specific use case.
-   * </p>
-   */
-  SELF setBufferFetchSizeHint(int fetchSize);
-
-  /**
-   * Set the mode to use the bean cache when executing this query.
-   * <p>
-   * By default, "find by id" and "find by natural key" will use the bean cache
-   * when bean caching is enabled. Setting this to false means that the query
-   * will not use the bean cache and instead hit the database.
-   * <p>
-   * By default, findList() with natural keys will not use the bean cache. In that
-   * case we need to explicitly use the bean cache.
-   */
-  SELF setBeanCacheMode(CacheMode beanCacheMode);
-
-  /**
-   * Set the {@link CacheMode} to use the query for executing this query.
-   */
-  SELF setUseQueryCache(CacheMode cacheMode);
-
-  /**
-   * Set this to false to not use the bean cache.
-   * <p>
-   * This method is now superseded by {@link #setBeanCacheMode(CacheMode)}
-   * which provides more explicit options controlled bean cache use.
-   * <p>
-   * This method is likely to be deprecated in the future with migration
-   * over to setUseBeanCache().
-   */
-  default SELF setUseCache(boolean useCache) {
-    return setBeanCacheMode(useCache ? CacheMode.ON : CacheMode.OFF);
-  }
-
-  /**
-   * Calls {@link #setUseQueryCache(CacheMode)} with <code>ON</code> or <code>OFF</code>.
-   */
-  default SELF setUseQueryCache(boolean enabled) {
-    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
-  }
-
-  /**
-   * Set the order by clause replacing the existing order by clause if there is
-   * one.
-   * <p>
-   * This follows SQL syntax using commas between each property with the
-   * optional asc and desc keywords representing ascending and descending order
-   * respectively.
-   */
-  SELF orderBy(String orderByClause);
-
-  /**
-   * Set an OrderBy object to replace any existing OrderBy clause.
-   */
-  SELF setOrderBy(OrderBy<T> orderBy);
-
-  /**
-   * Controls, if paginated queries should always append an 'order by id' statement at the end to
-   * guarantee a deterministic sort result. This may affect performance.
-   * If this is not enabled, and an orderBy is set on the query, it's up to the programmer that
-   * this query provides a deterministic result.
-   */
-  SELF orderById(boolean orderById);
-
-  /**
-   * Execute the query with the given lock type and WAIT.
-   * <p>
-   * Note that <code>forUpdate()</code> is the same as
-   * <code>withLock(LockType.UPDATE)</code>.
-   * <p>
-   * Provides us with the ability to explicitly use Postgres
-   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
-   */
-  SELF withLock(Query.LockType lockType);
-
-  /**
-   * Execute the query with the given lock type and lock wait.
-   * <p>
-   * Note that <code>forUpdateNoWait()</code> is the same as
-   * <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
-   * <p>
-   * Provides us with the ability to explicitly use Postgres
-   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
-   */
-  SELF withLock(Query.LockType lockType, Query.LockWait lockWait);
-
-  /**
-   * Execute using "for update" clause which results in the DB locking the record.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.WAIT)</code>.
-   */
-  SELF forUpdate();
-
-  /**
-   * Execute using "for update" clause with "no wait" option.
-   * <p>
-   * This is typically a Postgres and Oracle only option at this stage.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
-   */
-  SELF forUpdateNoWait();
-
-  /**
-   * Execute using "for update" clause with "skip locked" option.
-   * <p>
-   * This is typically a Postgres and Oracle only option at this stage.
-   * <p>
-   * The same as <code>withLock(LockType.UPDATE, LockWait.SKIPLOCKED)</code>.
-   */
-  SELF forUpdateSkipLocked();
-
-  /**
-   * Returns the set of properties or paths that are unknown (do not map to known properties or paths).
-   * <p>
-   * Validate the query checking the where and orderBy expression paths to confirm if
-   * they represent valid properties or paths for the given bean type.
-   */
-  Set<String> validate();
-
-  /**
-   * Return the sql that was generated for executing this query.
-   * <p>
-   * This is only available after the query has been executed and provided only
-   * for informational purposes.
-   */
-  String getGeneratedSql();
-
-  /**
-   * Return the type of beans being queried.
-   */
-  Class<T> getBeanType();
-
-  /**
-   * Execute as a delete query deleting the 'root level' beans that match the predicates
-   * in the query.
-   * <p>
-   * Note that if the query includes joins then the generated delete statement may not be
-   * optimal depending on the database platform.
-   *
-   * @return the number of beans/rows that were deleted.
-   */
-  int delete();
-
-  /**
-   * Execute the query returning true if a row is found.
-   * <p>
-   * The query is executed using max rows of 1 and will only select the id property.
-   * This method is really just a convenient way to optimise a query to perform a
-   * 'does a row exist in the db' check.
-   *
-   * <h2>Example using a query bean:</h2>
-   * <pre>{@code
-   *
-   *   boolean userExists =
-   *     new QContact()
-   *       .email.equalTo("rob@foo.com")
-   *       .exists();
-   *
-   * }</pre>
-   *
-   * <h2>Example:</h2>
-   * <pre>{@code
-   *
-   *   boolean userExists = query()
-   *     .where().eq("email", "rob@foo.com")
-   *     .exists();
-   *
-   * }</pre>
-   *
-   * @return True if the query finds a matching row in the database
-   */
-  boolean exists();
-
-  /**
-   * Execute the query returning either a single bean or null (if no matching
-   * bean is found).
-   * <p>
-   * If more than 1 row is found for this query then a PersistenceException is
-   * thrown.
-   * <p>
-   * This is useful when your predicates dictate that your query should only
-   * return 0 or 1 results.
-   * <p>
-   * <pre>{@code
-   *
-   * // assuming the sku of products is unique...
-   * Product product =
-   *     new QProduct()
-   *         .sku.equalTo("aa113")
-   *         .findOne();
-   * ...
-   * }</pre>
-   * <p>
-   * It is also useful with finding objects by their id when you want to specify
-   * further join information to optimise the query.
-   * <p>
-   * <pre>{@code
-   *
-   * // Fetch order 42 and additionally fetch join its order details...
-   * Order order =
-   *     new QOrder()
-   *         .fetch("details") // eagerly load the order details
-   *         .id.equalTo(42)
-   *         .findOne();
-   *
-   * // the order details were eagerly loaded
-   * List<OrderDetail> details = order.getDetails();
-   * ...
-   * }</pre>
-   */
-  @Nullable
-  T findOne();
-
-  /**
-   * Execute the query returning an optional bean.
-   */
-  Optional<T> findOneOrEmpty();
-
-  /**
-   * Execute the query returning the list of objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * <pre>{@code
-   *
-   * List<Customer> customers =
-   *     new QCustomer()
-   *       .name.ilike("rob%")
-   *       .findList();
-   *
-   * }</pre>
-   *
-   * @see Query#findList()
-   */
-  List<T> findList();
-
-  /**
-   * Execute the query returning the result as a Stream.
-   * <p>
-   * Note that this can support very large queries iterating
-   * any number of results. To do so internally it can use
-   * multiple persistence contexts.
-   * </p>
-   * <pre>{@code
-   *
-   *  // use try with resources to ensure Stream is closed
-   *
-   *  try (Stream<Customer> stream = query.findStream()) {
-   *    stream
-   *    .map(...)
-   *    .collect(...);
-   *  }
-   *
-   * }</pre>
-   */
-  Stream<T> findStream();
-
-  /**
-   * Execute the query returning the set of objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * <pre>{@code
-   *
-   * Set<Customer> customers =
-   *     new QCustomer()
-   *       .name.ilike("rob%")
-   *       .findSet();
-   *
-   * }</pre>
-   *
-   * @see Query#findSet()
-   */
-  Set<T> findSet();
-
-  /**
-   * Execute the query returning the list of Id's.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   *
-   * @see Query#findIds()
-   */
-  <A> List<A> findIds();
-
-  /**
-   * Execute the query returning a map of the objects.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * <p>
-   * You can use setMapKey() or asMapKey() to specify the property to be used as keys
-   * on the map. If one is not specified then the id property is used.
-   * <p>
-   * <pre>{@code
-   *
-   * Map<String, Product> map =
-   *   new QProduct()
-   *     .sku.asMapKey()
-   *     .findMap();
-   *
-   * }</pre>
-   *
-   * @see Query#findMap()
-   */
-  <K> Map<K, T> findMap();
-
-  /**
-   * Execute the query iterating over the results.
-   * <p>
-   * Note that findIterate (and findEach and findEachWhile) uses a "per graph"
-   * persistence context scope and adjusts jdbc fetch buffer size for large
-   * queries. As such it is better to use findList for small queries.
-   * <p>
-   * Remember that with {@link QueryIterator} you must call {@link QueryIterator#close()}
-   * when you have finished iterating the results (typically in a finally block).
-   * <p>
-   * findEach() and findEachWhile() are preferred to findIterate() as they ensure
-   * the jdbc statement and resultSet are closed at the end of the iteration.
-   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
-   * </p>
-   * <pre>{@code
-   *
-   *  Query<Customer> query =
-   *    new QCustomer()
-   *     .status.equalTo(Customer.Status.NEW)
-   *     .orderBy()
-   *       id.asc()
-   *     .query();
-   *
-   *  try (QueryIterator<Customer> it = query.findIterate()) {
-   *    while (it.hasNext()) {
-   *      Customer customer = it.next();
-   *      // do something with customer ...
-   *    }
-   *  }
-   *
-   * }</pre>
-   */
-  QueryIterator<T> findIterate();
-
-  /**
-   * Execute the query returning a list of values for a single property.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  List<String> names =
-   *    new QCustomer()
-   *      .setDistinct(true)
-   *      .select(name)
-   *      .findSingleAttributeList();
-   *
-   * }</pre>
-   *
-   * @return the list of values for the selected property
-   */
-  <A> List<A> findSingleAttributeList();
-
-  /**
-   * Execute the query returning a single value or null for a single property.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  LocalDate maxDate =
-   *    new QCustomer()
-   *      .select("max(startDate)")
-   *      .findSingleAttribute();
-   *
-   * }</pre>
-   *
-   * @return a single value or null for the selected property
-   */
-  @Nullable
-  <A> A findSingleAttribute();
-
-  /**
-   * Execute the query returning a single optional attribute value.
-   * <p>
-   * <h3>Example</h3>
-   * <pre>{@code
-   *
-   *  Optional<String> maybeName =
-   *    new QCustomer()
-   *      .select(name)
-   *      .id.eq(42)
-   *      .status.eq(NEW)
-   *      .findSingleAttributeOrEmpty();
-   *
-   * }</pre>
-   *
-   * @return an optional value for the selected property
-   */
-  <A> Optional<A> findSingleAttributeOrEmpty();
-
-  /**
-   * Execute the query returning a hashset of values for a single property.
-   */
-  <A> Set<A> findSingleAttributeSet();
-
-  /**
-   * Execute the query processing the beans one at a time.
-   * <p>
-   * This method is appropriate to process very large query results as the
-   * beans are consumed one at a time and do not need to be held in memory
-   * (unlike #findList #findSet etc)
-   * <p>
-   * Note that internally Ebean can inform the JDBC driver that it is expecting larger
-   * resultSet and specifically for MySQL this hint is required to stop it's JDBC driver
-   * from buffering the entire resultSet. As such, for smaller resultSets findList() is
-   * generally preferable.
-   * <p>
-   * Compared with #findEachWhile this will always process all the beans where as
-   * #findEachWhile provides a way to stop processing the query result early before
-   * all the beans have been read.
-   * <p>
-   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Consumer interface which is better suited to use with closures.
-   *
-   * <pre>{@code
-   *
-   *  new QCustomer()
-   *     .status.equalTo(Status.NEW)
-   *     .orderBy().id.asc()
-   *     .findEach((Customer customer) -> {
-   *
-   *       // do something with customer
-   *       System.out.println("-- visit " + customer);
-   *     });
-   *
-   * }</pre>
-   *
-   * @param consumer the consumer used to process the queried beans.
-   */
-  void findEach(Consumer<T> consumer);
-
-  /**
-   * Execute findEach streaming query batching the results for consuming.
-   * <p>
-   * This query execution will stream the results and is suited to consuming
-   * large numbers of results from the database.
-   * <p>
-   * Typically, we use this batch consumer when we want to do further processing on
-   * the beans and want to do that processing in batch form, for example - 100 at
-   * a time.
-   *
-   * @param batch    The number of beans processed in the batch
-   * @param consumer Process the batch of beans
-   */
-  void findEach(int batch, Consumer<List<T>> consumer);
-
-  /**
-   * Execute the query using callbacks to a visitor to process the resulting
-   * beans one at a time.
-   * <p>
-   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Predicate interface which is better suited to use with closures.
-   *
-   * <pre>{@code
-   *
-   *  new QCustomer()
-   *     .status.equalTo(Status.NEW)
-   *     .orderBy().id.asc()
-   *     .findEachWhile((Customer customer) -> {
-   *
-   *       // do something with customer
-   *       System.out.println("-- visit " + customer);
-   *
-   *       // return true to continue processing or false to stop
-   *       return (customer.getId() < 40);
-   *     });
-   *
-   * }</pre>
-   *
-   * @param consumer the consumer used to process the queried beans.
-   */
-  void findEachWhile(Predicate<T> consumer);
-
-  /**
-   * Return versions of a @History entity bean.
-   * <p>
-   * Generally this query is expected to be a find by id or unique predicates query.
-   * It will execute the query against the history returning the versions of the bean.
-   */
-  List<Version<T>> findVersions();
-
-  /**
-   * Return versions of a @History entity bean between a start and end timestamp.
-   * <p>
-   * Generally this query is expected to be a find by id or unique predicates query.
-   * It will execute the query against the history returning the versions of the bean.
-   */
-  List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end);
-
-  /**
-   * Return the count of entities this query should return.
-   * <p>
-   * This is the number of 'top level' or 'root level' entities.
-   */
-  int findCount();
-
-  /**
-   * Execute find row count query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   *
-   * @return a Future object for the row count query
-   */
-  FutureRowCount<T> findFutureCount();
-
-  /**
-   * Execute find Id's query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   *
-   * @return a Future object for the list of Id's
-   */
-  FutureIds<T> findFutureIds();
-
-  /**
-   * Execute find list query in a background thread.
-   * <p>
-   * This query will execute in it's own PersistenceContext and using its own transaction.
-   * What that means is that it will not share any bean instances with other queries.
-   *
-   * @return a Future object for the list result of the query
-   */
-  FutureList<T> findFutureList();
-
-  /**
-   * Return a PagedList for this query using firstRow and maxRows.
-   * <p>
-   * The benefit of using this over findList() is that it provides functionality to get the
-   * total row count etc.
-   * <p>
-   * If maxRows is not set on the query prior to calling findPagedList() then a
-   * PersistenceException is thrown.
-   * <p>
-   * <pre>{@code
-   *
-   *  PagedList<Order> pagedList =
-   *    new QOrder()
-   *       .setFirstRow(50)
-   *       .setMaxRows(20)
-   *       .findPagedList();
-   *
-   *       // fetch the total row count in the background
-   *       pagedList.loadRowCount();
-   *
-   *       List<Order> orders = pagedList.getList();
-   *       int totalRowCount = pagedList.getTotalRowCount();
-   *
-   * }</pre>
-   *
-   * @return The PagedList
-   */
-  PagedList<T> findPagedList();
-
-}

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

@@ -1,242 +0,0 @@
-package io.ebean;
-
-/**
- * Builder for ORM Query projection (the select and fetch part).
- *
- * @param <SELF> The builder type
- * @param <T>    The entity bean type
- */
-public interface QueryBuilderProjection<SELF, T> {
-
-  /**
-   * Apply the path properties replacing the select and fetch clauses.
-   * <p>
-   * This is typically used when the FetchPath is applied to both the query and the JSON output.
-   */
-  SELF apply(FetchPath fetchPath);
-
-  /**
-   * Specify the properties to fetch on the root level entity bean in comma delimited format.
-   * <p>
-   * The Id property is automatically included in the properties to fetch unless setDistinct(true)
-   * is set on the query.
-   * </p>
-   * <p>
-   * Use {@link #fetch(String, String)} to specify specific properties to fetch
-   * on other non-root level paths of the object graph.
-   * </p>
-   * <pre>{@code
-   *
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // Only fetch the customer id, name and status.
-   *     // This is described as a "Partial Object"
-   *     .select("name, status")
-   *     .where.ilike("name", "rob%")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param fetchProperties the properties to fetch for this bean (* = all properties).
-   */
-  SELF select(String fetchProperties);
-
-  /**
-   * Apply the fetchGroup which defines what part of the object graph to load.
-   */
-  SELF select(FetchGroup<T> fetchGroup);
-
-  /**
-   * Specify a path to fetch eagerly including specific properties.
-   * <p>
-   * Ebean will endeavour to fetch this path using a SQL join. If Ebean determines that it can
-   * not use a SQL join (due to maxRows or because it would result in a cartesian product) Ebean
-   * will automatically convert this fetch query into a "query join" - i.e. use fetchQuery().
-   * </p>
-   * <pre>{@code
-   *
-   * // query orders...
-   * List<Order> orders = DB.find(Order.class)
-   *       // fetch the customer...
-   *       // ... getting the customers name and phone number
-   *       .fetch("customer", "name, phoneNumber")
-   *
-   *       // ... also fetch the customers billing address (* = all properties)
-   *       .fetch("customer.billingAddress", "*")
-   *       .findList();
-   * }</pre>
-   * <p>
-   * If columns is null or "*" then all columns/properties for that path are fetched.
-   * </p>
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path            the property path we wish to fetch eagerly.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetch(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties using a "query join" (separate SQL query).
-   * <p>
-   * This is the same as:
-   * </p>
-   * <pre>{@code
-   *
-   *  fetch(path, fetchProperties, FetchConfig.ofQuery())
-   *
-   * }</pre>
-   * <p>
-   * This would be used instead of a fetch() when we use a separate SQL query to fetch this
-   * part of the object graph rather than a SQL join.
-   * <p>
-   * We might typically get a performance benefit when the path to fetch is a OneToMany
-   * or ManyToMany, the 'width' of the 'root bean' is wide and the cardinality of the many
-   * is high.
-   *
-   * @param path            the property path we wish to fetch eagerly.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetchQuery(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties using L2 bean cache.
-   *
-   * @param path            The path of the beans we are fetching from L2 cache.
-   * @param fetchProperties The properties that should be loaded.
-   */
-  SELF fetchCache(String path, String fetchProperties);
-
-  /**
-   * Fetch the path and properties lazily (via batch lazy loading).
-   * <p>
-   * This is the same as:
-   *
-   * <pre>{@code
-   *
-   *  fetch(path, fetchProperties, FetchConfig.ofLazy())
-   *
-   * }</pre>
-   * <p>
-   * The reason for using fetchLazy() is to either:
-   * <ul>
-   * <li>Control/tune what is fetched as part of lazy loading</li>
-   * <li>Make use of the L2 cache, build this part of the graph from L2 cache</li>
-   * </ul>
-   *
-   * @param path            the property path we wish to fetch lazily.
-   * @param fetchProperties properties of the associated bean that you want to include in the
-   *                        fetch (* means all properties, null also means all properties).
-   */
-  SELF fetchLazy(String path, String fetchProperties);
-
-  /**
-   * Additionally specify a FetchConfig to use a separate query or lazy loading
-   * to load this path.
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email", FetchConfig.ofLazy(10))
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path the property path we wish to fetch eagerly.
-   */
-  SELF fetch(String path, String fetchProperties, FetchConfig fetchConfig);
-
-  /**
-   * Specify a path to fetch eagerly including all its properties.
-   * <p>
-   * Ebean will endeavour to fetch this path using a SQL join. If Ebean determines that it can
-   * not use a SQL join (due to maxRows or because it would result in a cartesian product) Ebean
-   * will automatically convert this fetch query into a "query join" - i.e. use fetchQuery().
-   * </p>
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // eager fetch the contacts
-   *     .fetch("contacts")
-   *     .findList();
-   *
-   * }</pre>
-   *
-   * @param path the property path we wish to fetch eagerly.
-   */
-  SELF fetch(String path);
-
-  /**
-   * Fetch the path eagerly using a "query join" (separate SQL query).
-   * <p>
-   * This is the same as:
-   * <pre>{@code
-   *
-   *  fetch(path, FetchConfig.ofQuery())
-   *
-   * }</pre>
-   * <p>
-   * This would be used instead of a fetch() when we use a separate SQL query to fetch this
-   * part of the object graph rather than a SQL join.
-   * <p>
-   * We might typically get a performance benefit when the path to fetch is a OneToMany
-   * or ManyToMany, the 'width' of the 'root bean' is wide and the cardinality of the many
-   * is high.
-   *
-   * @param path the property path we wish to fetch eagerly
-   */
-  SELF fetchQuery(String path);
-
-  /**
-   * Fetch the path eagerly using L2 cache.
-   */
-  SELF fetchCache(String path);
-
-  /**
-   * Fetch the path lazily (via batch lazy loading).
-   * <p>
-   * This is the same as:
-   * </p>
-   * <pre>{@code
-   *
-   *  fetch(path, FetchConfig.ofLazy())
-   *
-   * }</pre>
-   * <p>
-   * The reason for using fetchLazy() is to either:
-   * </p>
-   * <ul>
-   * <li>Control/tune what is fetched as part of lazy loading</li>
-   * <li>Make use of the L2 cache, build this part of the graph from L2 cache</li>
-   * </ul>
-   *
-   * @param path the property path we wish to fetch lazily.
-   */
-  SELF fetchLazy(String path);
-
-  /**
-   * Additionally specify a JoinConfig to specify a "query join" and or define
-   * the lazy loading query.
-   * <pre>{@code
-   *
-   * // fetch customers (their id, name and status)
-   * List<Customer> customers = DB.find(Customer.class)
-   *     // lazy fetch contacts with a batch size of 100
-   *     .fetch("contacts", FetchConfig.ofLazy(100))
-   *     .findList();
-   *
-   * }</pre>
-   */
-  SELF fetch(String path, FetchConfig fetchConfig);
-
-}

ebean-api/src/main/java/io/ebean/config/SlowQueryEvent.java

@@ -1,29 +1,50 @@
 package io.ebean.config;
 
-import io.ebean.ProfileLocation;
 import io.ebean.bean.ObjectGraphNode;
 
-import java.util.List;
-
 /**
- * The data for the slow query.
+ * Slow query event.
  */
-public interface SlowQueryEvent {
+public class SlowQueryEvent {
+
+  private final String sql;
+
+  private final long timeMillis;
+
+  private final int rowCount;
+
+  private final ObjectGraphNode originNode;
+
+  /**
+   * Construct with the SQL and execution time in millis.
+   */
+  public SlowQueryEvent(String sql, long timeMillis, int rowCount, ObjectGraphNode originNode) {
+    this.sql = sql;
+    this.timeMillis = timeMillis;
+    this.rowCount = rowCount;
+    this.originNode = originNode;
+  }
 
   /**
    * Return the SQL for the slow query.
    */
-  String getSql();
+  public String getSql() {
+    return sql;
+  }
 
   /**
    * Return the execution time in millis.
    */
-  long getTimeMillis();
+  public long getTimeMillis() {
+    return timeMillis;
+  }
 
   /**
    * Return the total row count associated with the query.
    */
-  int getRowCount();
+  public int getRowCount() {
+    return rowCount;
+  }
 
   /**
    * Return the origin point for the root query.
@@ -32,20 +53,7 @@ public interface SlowQueryEvent {
    * shows the code that invoked the query.
    * </p>
    */
-  ObjectGraphNode getOriginNode();
-
-  /**
-   * Return the bind parameters.
-   */
-  List<Object> getBindParams();
-
-  /**
-   * Return the label.
-   */
-  String getLabel();
-
-  /**
-   * Return the profile location.
-   */
-  ProfileLocation getProfileLocation();
+  public ObjectGraphNode getOriginNode() {
+    return originNode;
+  }
 }

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

@@ -199,21 +199,12 @@ public class DatabasePlatform {
 
   protected SqlExceptionTranslator exceptionTranslator = new SqlCodeTranslator();
 
-  protected InsertSqlSyntaxExtension insertSqlSyntaxExtension = new StandardInsertSqlSyntax();
-
   /**
    * Instantiates a new database platform.
    */
   public DatabasePlatform() {
   }
 
-  /**
-   * Return the Insert SQL syntax helper.
-   */
-  public InsertSqlSyntaxExtension insertSqlSyntaxExtension() {
-    return insertSqlSyntaxExtension;
-  }
-
   /**
    * Translate the SQLException into a specific persistence exception if possible.
    */

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

@@ -1,32 +0,0 @@
-package io.ebean.config.dbplatform;
-
-/**
- * Insert SQL syntax to allow support for ClickHouse type optimisation for inserts.
- */
-public interface InsertSqlSyntaxExtension {
-
-  /**
-   * Start the columns.
-   */
-  String startColumns();
-
-  /**
-   * End of the columns.
-   */
-  String endColumns();
-
-  /**
-   * Return true for insert to use standard binding.
-   */
-  boolean useBinding();
-
-  /**
-   * Start types for non-standard binding (e.g. ClickHouse).
-   */
-  String startTypes();
-
-  /**
-   * End types for non-standard binding (e.g. ClickHouse).
-   */
-  String endTypes();
-}

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

@@ -1,32 +0,0 @@
-package io.ebean.config.dbplatform;
-
-/**
- * Standard Insert SQL syntax.
- */
-public final class StandardInsertSqlSyntax implements InsertSqlSyntaxExtension {
-
-  @Override
-  public String startColumns() {
-    return " (";
-  }
-
-  @Override
-  public String endColumns() {
-    return ") values (";
-  }
-
-  @Override
-  public boolean useBinding() {
-    return true;
-  }
-
-  @Override
-  public String startTypes() {
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public String endTypes() {
-    throw new IllegalStateException();
-  }
-}

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.1.0</version>
+    <version>14.0.2</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.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
@@ -125,13 +125,13 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
@@ -155,37 +155,37 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-spring-txn</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <!-- platforms -->
@@ -193,79 +193,79 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-clickhouse</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis-types</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>14.1.0</version>
+        <version>14.0.2</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.0.2</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.0.2</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.0.2</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.0.2</version>
     </dependency>
 
     <dependency>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
     </dependency>
 
     <dependency>
@@ -159,21 +159,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</version>
       <scope>test</scope>
     </dependency>
 

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

@@ -84,7 +84,7 @@ public interface SpiExpression extends Expression {
    *
    * @param request the associated request.
    */
-  void addBindValues(SpiExpressionBind request);
+  void addBindValues(SpiExpressionRequest request);
 
   /**
    * Validate all the properties/paths associated with this expression.

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

@@ -1,29 +0,0 @@
-package io.ebeaninternal.api;
-
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-
-/**
- * Expression bind values capture.
- */
-public interface SpiExpressionBind {
-
-  /**
-   * Return the bean descriptor for the root type.
-   */
-  BeanDescriptor<?> descriptor();
-
-  /**
-   * Add an encryption key to bind to this request.
-   */
-  void addBindEncryptKey(Object encryptKey);
-
-  /**
-   * Add a bind value to this request.
-   */
-  void addBindValue(Object bindValue);
-
-  /**
-   * Escapes a string to use it as exact match in Like clause.
-   */
-  String escapeLikeString(String value);
-}

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

@@ -1,6 +1,7 @@
 package io.ebeaninternal.api;
 
 import io.ebeaninternal.server.core.SpiOrmQueryRequest;
+import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.expression.platform.DbExpressionRequest;
 
@@ -9,7 +10,7 @@ import java.util.List;
 /**
  * Request object used for gathering expression sql and bind values.
  */
-public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionRequest {
+public interface SpiExpressionRequest extends DbExpressionRequest {
 
   /**
    * Return the DB specific handler for JSON and ARRAY expressions.
@@ -21,6 +22,11 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
    */
   String parseDeploy(String logicalProp);
 
+  /**
+   * Return the bean descriptor for the root type.
+   */
+  BeanDescriptor<?> descriptor();
+
   /**
    * Return the associated QueryRequest.
    */
@@ -52,6 +58,16 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
    */
   SpiExpressionRequest parse(String expression);
 
+  /**
+   * Add an encryption key to bind to this request.
+   */
+  void addBindEncryptKey(Object encryptKey);
+
+  /**
+   * Add a bind value to this request.
+   */
+  void addBindValue(Object bindValue);
+
   /**
    * Return the accumulated expression sql for all expressions in this request.
    */
@@ -72,6 +88,11 @@ public interface SpiExpressionRequest extends SpiExpressionBind, DbExpressionReq
    */
   void appendLike(boolean rawLikeExpression);
 
+  /**
+   * Escapes a string to use it as exact match in Like clause.
+   */
+  String escapeLikeString(String value);
+
   /**
    * Append IN expression taking into account platform and type support for Multi-value.
    */

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

@@ -1,70 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebean.ProfileLocation;
-import io.ebean.bean.ObjectGraphNode;
-import io.ebean.config.SlowQueryEvent;
-
-import java.util.List;
-
-/**
- * Slow query event.
- */
-final class DSlowQueryEvent implements SlowQueryEvent {
-
-  private final String sql;
-  private final long timeMillis;
-  private final int rowCount;
-  private final ObjectGraphNode originNode;
-  private final List<Object> bindParams;
-  private final String label;
-  private final ProfileLocation profileLocation;
-
-  /**
-   * Construct with the SQL and execution time in millis.
-   */
-  DSlowQueryEvent(String sql, long timeMillis, int rowCount, ObjectGraphNode originNode,
-                         List<Object> bindParams, String label, ProfileLocation profileLocation) {
-    this.sql = sql;
-    this.timeMillis = timeMillis;
-    this.rowCount = rowCount;
-    this.originNode = originNode;
-    this.bindParams = bindParams;
-    this.profileLocation = profileLocation;
-    this.label = label != null ? label : profileLocation == null ? null : profileLocation.label();
-  }
-
-  @Override
-  public String getSql() {
-    return sql;
-  }
-
-  @Override
-  public long getTimeMillis() {
-    return timeMillis;
-  }
-
-  @Override
-  public int getRowCount() {
-    return rowCount;
-  }
-
-  @Override
-  public ObjectGraphNode getOriginNode() {
-    return originNode;
-  }
-
-  @Override
-  public List<Object> getBindParams() {
-    return bindParams;
-  }
-
-  @Override
-  public String getLabel() {
-    return label;
-  }
-
-  @Override
-  public ProfileLocation getProfileLocation() {
-    return profileLocation;
-  }
-}

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

@@ -2184,9 +2184,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public void slowQueryCheck(long timeMicros, int rowCount, SpiQuery<?> query) {
     if (timeMicros > slowQueryMicros && slowQueryListener != null) {
-      List<Object> bindParams = new SlowQueryBindCapture(query).capture();
-      slowQueryListener.process(new DSlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount,
-        query.parentNode(), bindParams, query.label(), query.profileLocation()));
+      slowQueryListener.process(new SlowQueryEvent(query.getGeneratedSql(), timeMicros / 1000L, rowCount, query.parentNode()));
     }
   }
 

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

@@ -1,12 +1,10 @@
 package io.ebeaninternal.server.core;
 
 import io.avaje.applog.AppLog;
-import io.ebean.ProfileLocation;
+import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.SlowQueryEvent;
 import io.ebean.config.SlowQueryListener;
 
-import java.util.List;
-
 import static java.lang.System.Logger.Level.WARNING;
 
 /**
@@ -18,10 +16,11 @@ final class DefaultSlowQueryListener implements SlowQueryListener {
 
   @Override
   public void process(SlowQueryEvent event) {
-    ProfileLocation profileLocation = event.getProfileLocation();
-    String loc = profileLocation == null ? "" : profileLocation.fullLocation();
-    List<Object> bindParams = event.getBindParams();
-    log.log(WARNING, "Slow query warning - millis:{0} rows:{1} location:{2} sql[{3}] params{4}",
-      event.getTimeMillis(), event.getRowCount(), loc, event.getSql(), bindParams);
+    String firstStack = "";
+    ObjectGraphNode node = event.getOriginNode();
+    if (node != null) {
+      firstStack = node.origin().top();
+    }
+    log.log(WARNING, "Slow query warning - millis:{0} rows:{1} caller[{2}] sql[{3}]", event.getTimeMillis(), event.getRowCount(), firstStack, event.getSql());
   }
 }

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

@@ -1,71 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebeaninternal.api.BindParams;
-import io.ebeaninternal.api.SpiExpressionBind;
-import io.ebeaninternal.api.SpiExpressionList;
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.persist.MultiValueWrapper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-final class SlowQueryBindCapture implements SpiExpressionBind {
-
-  private final SpiQuery<?> query;
-  private final List<Object> bindParams = new ArrayList<>();
-
-  SlowQueryBindCapture(SpiQuery<?> query) {
-    this.query = query;
-  }
-
-  List<Object> capture() {
-    var params = query.bindParams();
-    if (params != null) {
-      var positionedParameters = params.positionedParameters();
-      for (BindParams.Param param : positionedParameters) {
-        if (param.isInParam()) {
-          add(param.inValue());
-        }
-      }
-    }
-    Object id = query.getId();
-    if (id != null) {
-      add(id);
-    }
-    SpiExpressionList<?> spiExpressionList = query.whereExpressions();
-    if (spiExpressionList != null) {
-      spiExpressionList.addBindValues(this);
-    }
-    return bindParams;
-  }
-
-  private void add(Object value) {
-    if (value instanceof MultiValueWrapper) {
-      var mvw = (MultiValueWrapper) value;
-      bindParams.add(mvw.getValues());
-    } else {
-      bindParams.add(value);
-    }
-  }
-
-  @Override
-  public BeanDescriptor<?> descriptor() {
-    return query.descriptor();
-  }
-
-  @Override
-  public void addBindValue(Object bindValue) {
-    add(bindValue);
-  }
-
-  @Override
-  public void addBindEncryptKey(Object encryptKey) {
-    bindParams.add("*");
-  }
-
-  @Override
-  public String escapeLikeString(String value) {
-    return query.descriptor().ebeanServer().databasePlatform().escapeLikeString(value);
-  }
-}

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

@@ -5,7 +5,6 @@ import io.ebean.DatabaseBuilder;
 import io.ebean.Model;
 import io.ebean.RawSqlBuilder;
 import io.ebean.annotation.ConstraintMode;
-import io.ebean.annotation.Platform;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.config.*;
@@ -633,8 +632,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   }
 
   private void registerDescriptor(DeployBeanInfo<?> info) {
-    platformUsesColumnDefinitions(info);
-
     BeanDescriptor<?> desc = new BeanDescriptor<>(this, info.getDescriptor());
     descMap.put(desc.type().getName(), desc);
     if (desc.isDocStoreMapped()) {
@@ -647,23 +644,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     }
   }
 
-  private void platformUsesColumnDefinitions(DeployBeanInfo<?> info) {
-    if (databasePlatform.isPlatform(Platform.CLICKHOUSE) && !DbOffline.isGenerateMigration()) {
-      // ClickHouse uses column definition to optimise JDBC bulk inserts
-      DbPlatformTypeMapping typeMapping = databasePlatform.dbTypeMap();
-      for (DeployBeanProperty property : info.getDescriptor().propertiesAll()) {
-        if (property.getDbColumnDefn() == null) {
-          DbPlatformType dbPlatformType = typeMapping.get(property.getDbType());
-          String columnDefn = dbPlatformType.renderType(property.getDbLength(), property.getDbScale());
-          if (property.isNullable()) {
-            columnDefn = "Nullable(" + columnDefn + ")";
-          }
-          property.setDbColumnDefn(columnDefn);
-        }
-      }
-    }
-  }
-
   /**
    * Read the initial deployment information for the entities.
    * <p>

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

@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy.id;
 
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -144,7 +143,7 @@ public interface IdBinder {
   /**
    * Binds multiple id value to a request.
    */
-  void addBindValues(SpiExpressionBind request, Collection<?> ids);
+  void addBindValues(SpiExpressionRequest request, Collection<?> ids);
 
   /**
    * Return the sql for binding the id using an IN clause.

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.deploy.id;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.util.SplitName;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -270,7 +269,7 @@ public final class IdBinderEmbedded implements IdBinder {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request, Collection<?> values) {
+  public void addBindValues(SpiExpressionRequest request, Collection<?> values) {
     for (Object value : values) {
       final EntityBean bean = (EntityBean) value;
       for (BeanProperty prop : props) {

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

@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy.id;
 
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.bind.DataBind;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
@@ -131,7 +130,7 @@ final class IdBinderEmpty implements IdBinder {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request, Collection<?> ids) {
+  public void addBindValues(SpiExpressionRequest request, Collection<?> ids) {
   }
 
   @Override

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.deploy.id;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.core.InternString;
@@ -144,7 +143,7 @@ public final class IdBinderSimple implements IdBinder {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request, Collection<?> values) {
+  public void addBindValues(SpiExpressionRequest request, Collection<?> values) {
     List<Object> copy = new ArrayList<>(values);
     copy.replaceAll(idValue -> convertSetId(idValue, null));
     request.addBindValue(new MultiValueWrapper(copy));

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

@@ -43,11 +43,6 @@ public interface ImportedId {
    */
   void dmlAppend(GenerateDmlRequest request);
 
-  /**
-   * Append column and type for Insert (ClickHouse).
-   */
-  void dmlType(GenerateDmlRequest request);
-
   /**
    * Bind the value from the bean.
    */

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

@@ -66,16 +66,6 @@ public final class ImportedIdEmbedded implements ImportedId {
     }
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    boolean update = request.isUpdate();
-    for (ImportedIdSimple anImported : imported) {
-      if (anImported.isInclude(update)) {
-        anImported.dmlType(request);
-      }
-    }
-  }
-
   @Override
   public String importedIdClause() {
     StringBuilder sb = new StringBuilder();

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

@@ -37,7 +37,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
 
   final BeanPropertyAssoc<?> owner;
   final String localDbColumn;
-  private final String localColumnDefn;
   private final String localSqlFormula;
   final BeanProperty foreignProperty;
   private final int position;
@@ -50,7 +49,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     this.localDbColumn = InternString.intern(localDbColumn);
     this.localSqlFormula = InternString.intern(localSqlFormula);
     this.foreignProperty = foreignProperty;
-    this.localColumnDefn = foreignProperty.dbColumnDefn();
     this.position = position;
     this.insertable = insertable;
     this.updateable = updateable;
@@ -145,11 +143,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     request.appendColumn(localDbColumn);
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    request.appendColumnDefn(localDbColumn, localColumnDefn);
-  }
-
   @Override
   public String importedIdClause() {
     return localDbColumn + " = ?";

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

@@ -97,7 +97,7 @@ abstract class AbstractExpression implements SpiExpression {
     validation.validate(propName);
   }
 
-  protected final ElPropertyValue getElProp(SpiExpressionBind request) {
+  protected final ElPropertyValue getElProp(SpiExpressionRequest request) {
     return request.descriptor().elGetValue(propName);
   }
 }

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
 /**
@@ -29,7 +28,7 @@ abstract class AbstractTextExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     // do nothing, only execute against document store
   }
 

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

@@ -51,7 +51,7 @@ final class AllEqualsExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     if (propMap.isEmpty()) {
       return;
     }

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
 import java.io.IOException;
@@ -73,7 +72,7 @@ final class ArrayContainsExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     for (Object value : values) {
       request.addBindValue(value);
     }

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
 import java.io.IOException;
@@ -50,7 +49,7 @@ final class ArrayIsEmptyExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     // nothing to bind
   }
 }

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
@@ -35,7 +34,7 @@ final class BetweenExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     ElPropertyValue prop = getElProp(request);
     if (prop != null && prop.isDbEncrypted()) {
       // bind the key as well as the value

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

@@ -75,7 +75,7 @@ final class BetweenPropertyExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     request.addBindValue(val());
   }
 

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
 /**
@@ -53,7 +52,7 @@ final class BitwiseExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     request.addBindValue(flags);
     request.addBindValue(match);
   }

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
@@ -34,7 +33,7 @@ final class CaseInsensitiveEqualExpression extends AbstractValueExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     ElPropertyValue prop = getElProp(request);
     if (prop != null && prop.isDbEncrypted()) {
       // bind the key as well as the value

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

@@ -5,7 +5,12 @@ import io.ebean.LikeType;
 import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.util.SplitName;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.NaturalKeyQueryData;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
@@ -189,7 +194,8 @@ final class DefaultExampleExpression implements SpiExpression, ExampleExpression
    * Adds bind values to the request.
    */
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
+
     for (SpiExpression item : list) {
       item.addBindValues(request);
     }

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

@@ -591,7 +591,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     for (SpiExpression expr : list) {
       expr.addBindValues(request);
     }

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

@@ -99,7 +99,7 @@ final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreE
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     for (Object bindParam : bindParams) {
       request.addBindValue(bindParam);
     }

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

@@ -77,7 +77,7 @@ final class ExistsSqlQueryExpression implements SpiExpression, UnsupportedDocSto
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     for (Object bindParam : bindParams) {
       request.addBindValue(bindParam);
     }

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

@@ -45,7 +45,7 @@ final class IdExpression extends NonPrepareExpression implements SpiExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     // 'flatten' EmbeddedId and multiple ID cases
     // into an array of the underlying scalar field values
     for (Object bindIdValue : request.descriptor().bindIdValues(value)) {

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

@@ -61,7 +61,7 @@ public final class IdInExpression extends NonPrepareExpression implements IdInCo
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     if (idCollection.isEmpty()) {
       return;
     }

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

@@ -2,7 +2,10 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.NaturalKeyQueryData;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.persist.MultiValueWrapper;
 
@@ -100,7 +103,7 @@ public final class InExpression extends AbstractExpression implements IdInCommon
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     if (empty) {
       return;
     }

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

@@ -3,7 +3,10 @@ package io.ebeaninternal.server.expression;
 import io.ebean.Pairs;
 import io.ebean.Pairs.Entry;
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.NaturalKeyQueryData;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.persist.MultiValueWrapper;
 
 import java.util.ArrayList;
@@ -55,7 +58,8 @@ final class InPairsExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
+
     // Note at this point entries may have been removed when used with l2 caching
     // ... for each l2 cache hit an entry was removed
     this.concatBindValues = new ArrayList<>(entries.size());

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
@@ -33,7 +32,7 @@ final class InRangeExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     ElPropertyValue prop = getElProp(request);
     if (prop != null && prop.isDbEncrypted()) {
       // bind the key twice, for both values

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

@@ -2,7 +2,10 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.InTuples;
 import io.ebean.service.SpiInTuples;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.NaturalKeyQueryData;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
 
 import java.util.List;
 
@@ -34,7 +37,7 @@ final class InTuplesExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     for (Object[] entry : entries) {
       for (Object value : entry) {
         requireNonNull(value);

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

@@ -1,7 +1,10 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.util.SplitName;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
@@ -50,7 +53,7 @@ final class IsEmptyExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     // no bind values
   }
 

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
 import java.io.IOException;
@@ -103,7 +102,7 @@ final class JsonPathExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     if (value != null) {
       // value is null for EXISTS/NOT EXISTS
       request.addBindValue(value);

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

@@ -141,7 +141,7 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     for (SpiExpression expr : exprList.internalList()) {
       expr.addBindValues(request);
     }

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

@@ -3,7 +3,6 @@ package io.ebeaninternal.server.expression;
 import io.ebean.LikeType;
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
@@ -26,7 +25,7 @@ final class LikeExpression extends AbstractValueExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     ElPropertyValue prop = getElProp(request);
     if (prop != null && prop.isDbEncrypted()) {
       // bind the key as well as the value
@@ -79,7 +78,7 @@ final class LikeExpression extends AbstractValueExpression {
     return strValue().equals(that.strValue());
   }
 
-  private static String getValue(String value, boolean caseInsensitive, LikeType type, SpiExpressionBind request) {
+  private static String getValue(String value, boolean caseInsensitive, LikeType type, SpiExpressionRequest request) {
     if (caseInsensitive) {
       value = value.toLowerCase();
     }

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

@@ -3,7 +3,12 @@ package io.ebeaninternal.server.expression;
 import io.ebean.Expression;
 import io.ebean.Junction;
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.NaturalKeyQueryData;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
 import java.io.IOException;
@@ -128,7 +133,7 @@ abstract class LogicExpression implements SpiExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     expOne.addBindValues(request);
     expTwo.addBindValues(request);
   }

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

@@ -3,7 +3,6 @@ package io.ebeaninternal.server.expression;
 import io.ebean.LikeType;
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
@@ -24,7 +23,8 @@ final class NativeILikeExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
+
     ElPropertyValue prop = getElProp(request);
     if (prop != null && prop.isDbEncrypted()) {
       // bind the key as well as the value

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

@@ -1,8 +1,13 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.api.NaturalKeyQueryData;
 
 import java.io.IOException;
 
@@ -89,7 +94,7 @@ final class NestedPathWrapperExpression implements SpiExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     delegate.addBindValues(request);
   }
 

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

@@ -78,7 +78,7 @@ final class NoopExpression implements SpiExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     // nothing to do
   }
 

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

@@ -2,7 +2,12 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.Expression;
 import io.ebean.event.BeanQueryRequest;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.NaturalKeyQueryData;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
+import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
 import java.io.IOException;
@@ -68,7 +73,7 @@ final class NotExpression implements SpiExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     exp.addBindValues(request);
   }
 

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

@@ -1,7 +1,10 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.util.SplitName;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.ManyWhereJoins;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
@@ -48,7 +51,7 @@ final class NullExpression extends AbstractExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
 
   }
 

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

@@ -42,7 +42,7 @@ final class RawExpression extends NonPrepareExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     if (values != null) {
       for (Object value : values) {
         if (value instanceof Collection<?>) {

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

@@ -2,7 +2,10 @@ package io.ebeaninternal.server.expression;
 
 import io.ebean.bean.EntityBean;
 import io.ebean.plugin.ExpressionPath;
-import io.ebeaninternal.api.*;
+import io.ebeaninternal.api.BindValuesKey;
+import io.ebeaninternal.api.NaturalKeyQueryData;
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.IOException;
@@ -65,7 +68,8 @@ public final class SimpleExpression extends AbstractValueExpression {
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
+
     ElPropertyValue prop = getElProp(request);
     if (prop != null) {
       if (prop.isAssocId()) {

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

@@ -79,7 +79,7 @@ final class SubQueryExpression extends AbstractExpression implements Unsupported
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     for (Object bindParam : bindParams) {
       request.addBindValue(bindParam);
     }

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

@@ -2,7 +2,6 @@ package io.ebeaninternal.server.expression;
 
 import io.ebeaninternal.api.BindValuesKey;
 import io.ebeaninternal.api.SpiExpression;
-import io.ebeaninternal.api.SpiExpressionBind;
 import io.ebeaninternal.api.SpiExpressionRequest;
 
 import java.util.Arrays;
@@ -48,7 +47,7 @@ final class SubQueryRawExpression extends AbstractExpression implements Unsuppor
   }
 
   @Override
-  public void addBindValues(SpiExpressionBind request) {
+  public void addBindValues(SpiExpressionRequest request) {
     for (Object bindParam : bindParams) {
       request.addBindValue(bindParam);
     }

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java

@@ -15,26 +15,14 @@ public final class GenerateDmlRequest {
   private String prefix2;
   private int insertMode;
   private int bindColumnCount;
-  private boolean hasColumnDefn;
 
   GenerateDmlRequest append(String s) {
     sb.append(s);
     return this;
   }
 
-  /**
-   * Append column and type for Insert (ClickHouse).
-   */
-  public void appendColumnDefn(String columnName, String columnDefn) {
-    if (hasColumnDefn) {
-      sb.append(", ");
-    } else {
-      hasColumnDefn = true;
-    }
-    sb.append(columnName).append(' ').append(columnDefn);
-  }
-
   public void appendColumn(String column) {
+    //String bind = (insertMode > 0) ? "?" : "=?";
     appendColumn(column, "?");
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java

@@ -4,7 +4,6 @@ import io.ebean.InsertOptions;
 import io.ebean.annotation.Platform;
 import io.ebean.bean.EntityBean;
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.InsertSqlSyntaxExtension;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.InheritInfo;
@@ -38,13 +37,10 @@ final class InsertMeta {
   private final Bindable shadowFKey;
   private final String[] identityDbColumns;
   private final Platform platform;
-  private final InsertSqlSyntaxExtension insertMetaSql;
-
   private final InsertMetaOptions options;
 
   InsertMeta(DatabasePlatform dbPlatform, BeanDescriptor<?> desc, Bindable shadowFKey, BindableId id, BindableList all) {
     this.platform = dbPlatform.platform();
-    this.insertMetaSql = dbPlatform.insertSqlSyntaxExtension();
     this.options = InsertMetaPlatform.create(platform, desc, this);
     this.discriminator = discriminator(desc);
     this.id = id;
@@ -178,7 +174,7 @@ final class InsertMeta {
       request.append(defaultValues());
       return;
     }
-    request.append(insertMetaSql.startColumns());
+    request.append(" (");
     if (!nullId) {
       id.dmlAppend(request);
     }
@@ -193,28 +189,9 @@ final class InsertMeta {
     } else {
       allExcludeDraftOnly.dmlAppend(request);
     }
-    request.append(insertMetaSql.endColumns());
-    if (insertMetaSql.useBinding()) {
-      request.append(request.insertBindBuffer());
-      request.append(")");
-    } else {
-      request.append(insertMetaSql.startTypes());
-      if (!nullId) {
-        id.dmlType(request);
-      }
-      if (shadowFKey != null) {
-        shadowFKey.dmlType(request);
-      }
-      if (discriminator != null) {
-        discriminator.dmlType(request);
-      }
-      if (draftTable) {
-        all.dmlType(request);
-      } else {
-        allExcludeDraftOnly.dmlType(request);
-      }
-      request.append(insertMetaSql.endTypes());
-    }
+    request.append(") values (");
+    request.append(request.insertBindBuffer());
+    request.append(")");
   }
 
   private String defaultValues() {

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

@@ -33,11 +33,6 @@ public interface Bindable {
    */
   void dmlAppend(GenerateDmlRequest request);
 
-  /**
-   * Append column and type for Insert (ClickHouse).
-   */
-  void dmlType(GenerateDmlRequest request);
-
   /**
    * Bind given the request and bean. The bean could be the oldValues bean
    * when binding a update or delete where clause with ALL concurrency mode.

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

@@ -40,11 +40,6 @@ class BindableAssocOne implements Bindable {
     importedId.dmlAppend(request);
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    importedId.dmlType(request);
-  }
-
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
     EntityBean assocBean = (EntityBean) assocOne.getValue(bean);

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

@@ -39,11 +39,6 @@ public final class BindableDiscriminator implements Bindable {
     request.appendColumn(columnName);
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    throw new IllegalArgumentException("Not supported");
-  }
-
   @Override
   public void dmlBind(BindableRequest bindRequest, EntityBean bean) throws SQLException {
     bindRequest.bind(discValue, sqlType);

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

@@ -35,13 +35,6 @@ final class BindableEmbedded implements Bindable {
     }
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    for (Bindable item : items) {
-      item.dmlType(request);
-    }
-  }
-
   @Override
   public void addToUpdate(PersistRequestBean<?> request, List<Bindable> list) {
     if (request.isAddToUpdate(embProp)) {

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

@@ -41,11 +41,6 @@ final class BindableEncryptedProperty implements Bindable {
     request.appendColumn(prop.dbColumn(), prop.dbBind());
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    request.appendColumnDefn(prop.dbColumn(), prop.dbColumnDefn());
-  }
-
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
     Object value = null;

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

@@ -81,13 +81,6 @@ final class BindableIdEmbedded implements BindableId {
     }
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    for (BeanProperty prop : props) {
-      request.appendColumn(prop.dbColumnDefn());
-    }
-  }
-
   @Override
   public boolean deriveConcatenatedId(PersistRequestBean<?> persist) {
     if (matches == null) {

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

@@ -28,11 +28,6 @@ final class BindableIdEmpty implements BindableId {
     // nothing
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    // nothing
-  }
-
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) {
     // nothing

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

@@ -58,18 +58,17 @@ final class BindableIdScalar implements BindableId {
 
   @Override
   public void dmlAppend(GenerateDmlRequest request) {
+
     request.appendColumn(uidProp.dbColumn());
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    request.appendColumnDefn(uidProp.dbColumn(), uidProp.dbColumnDefn());
-  }
-
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
+
     Object value = uidProp.getValue(bean);
+
     request.bind(value, uidProp);
+
     // used for summary logging
     request.setIdValue(value);
   }

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

@@ -60,13 +60,6 @@ public final class BindableList implements Bindable {
     }
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    for (Bindable item : items) {
-      item.dmlType(request);
-    }
-  }
-
   @Override
   public void dmlBind(BindableRequest bindRequest, EntityBean bean) throws SQLException {
     for (Bindable item : items) {

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

@@ -36,11 +36,6 @@ class BindableProperty implements Bindable {
     request.appendColumn(prop.dbColumn());
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    request.appendColumnDefn(prop.dbColumn(), prop.dbColumnDefn());
-  }
-
   /**
    * Normal binding of a property value from the bean.
    */

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

@@ -41,11 +41,6 @@ final class BindablePropertyVersion implements Bindable {
     request.appendColumn(prop.dbColumn());
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    request.appendColumnDefn(prop.dbColumn(), prop.dbColumnDefn());
-  }
-
   /**
    * Normal binding of a property value from the bean.
    */

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

@@ -45,11 +45,6 @@ public final class BindableUnidirectional implements Bindable {
     importedId.dmlAppend(request);
   }
 
-  @Override
-  public void dmlType(GenerateDmlRequest request) {
-    importedId.dmlType(request);
-  }
-
   @Override
   public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException {
     PersistRequestBean<?> persistRequest = request.persistRequest();

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

@@ -3,9 +3,8 @@ package io.ebeaninternal.server.query;
 import io.ebean.PagedList;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiQuery;
-import jakarta.persistence.PersistenceException;
 
-import java.util.Collections;
+import jakarta.persistence.PersistenceException;
 import java.util.List;
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
@@ -21,7 +20,7 @@ public final class LimitOffsetPagedList<T> implements PagedList<T> {
   private final int firstRow;
   private final int maxRows;
 
-  private int totalRowCount = -1;
+  private int foregroundTotalRowCount = -1;
   private Future<Integer> futureRowCount;
   private List<T> list;
 
@@ -58,12 +57,7 @@ public final class LimitOffsetPagedList<T> implements PagedList<T> {
     lock.lock();
     try {
       if (list == null) {
-        if (totalRowCount == 0) {
-          // already count and no rows
-          list = Collections.emptyList();
-        } else {
-          list = server.findList(query);
-        }
+        list = server.findList(query);
       }
       return list;
     } finally {
@@ -93,21 +87,20 @@ public final class LimitOffsetPagedList<T> implements PagedList<T> {
   public int getTotalCount() {
     lock.lock();
     try {
-      if (totalRowCount > -1) {
-        return totalRowCount;
-      }
       if (futureRowCount != null) {
         try {
           // background query already initiated so get it with a wait
-          totalRowCount = futureRowCount.get();
-          return totalRowCount;
+          return futureRowCount.get();
         } catch (Exception e) {
           throw new PersistenceException(e);
         }
       }
+      // already fetched?
+      if (foregroundTotalRowCount > -1) return foregroundTotalRowCount;
+
       // just using foreground thread
-      totalRowCount = server.findCount(query);
-      return totalRowCount;
+      foregroundTotalRowCount = server.findCount(query);
+      return foregroundTotalRowCount;
     } finally {
       lock.unlock();
     }

ebean-core/src/test/java/io/ebeaninternal/server/core/SlowQueryBindCaptureTest.java

@@ -1,74 +0,0 @@
-package io.ebeaninternal.server.core;
-
-import io.ebean.DB;
-import io.ebean.Database;
-import io.ebean.Query;
-import io.ebeaninternal.api.SpiQuery;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.tests.model.basic.Customer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class SlowQueryBindCaptureTest {
-
-  static Database db;
-
-  @BeforeAll
-  static void beforeAll() {
-    db = DB.getDefault();
-    db.script().run("/h2-init.sql");
-  }
-
-  @Test
-  void bindParams_capture() {
-    String sql = "select * from o_customer p where p.status = ?";
-    Query<Customer> query = db.findNative(Customer.class, sql)
-      .setParameter("N");
-    query.findList();
-
-    var sbc = new SlowQueryBindCapture((SpiQuery<?>) query);
-    List<Object> bindParams = sbc.capture();
-    assertThat(bindParams).hasSize(1);
-    assertThat(bindParams.get(0)).isEqualTo("N");
-  }
-
-  @Test
-  void expressionsCapture() {
-    Query<Customer> query = db.find(Customer.class)
-      .where()
-      .startsWith("name", "rob")
-      .eq("status", "N")
-      .query();
-
-    query.findList();
-
-    var sbc = new SlowQueryBindCapture((SpiQuery<?>) query);
-    List<Object> bindParams = sbc.capture();
-    assertThat(bindParams).hasSize(2);
-    assertThat(bindParams.get(0)).isEqualTo("rob%");
-    assertThat(bindParams.get(1)).isEqualTo("N");
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  void multiValueCapture() {
-    Query<Customer> query = db.find(Customer.class)
-      .where()
-      .in("id", List.of(1, 2, 3, 4))
-      .query();
-
-    query.findList();
-
-    var sbc = new SlowQueryBindCapture((SpiQuery<?>) query);
-    List<Object> bindParams = sbc.capture();
-    assertThat(bindParams).hasSize(1);
-    Object bindParam0 = bindParams.get(0);
-    assertThat(bindParam0).isInstanceOf(ArrayList.class);
-    var values = (ArrayList<Object>) bindParam0;
-    assertThat(values).contains(1, 2, 3, 4);
-  }
-}

ebean-core/src/test/resources/h2-init.sql

@@ -1,5 +1,5 @@
 
-create table if not exists animal (
+create table animal (
   species                       varchar(255) not null,
   id                            bigint generated by default as identity not null,
   shelter_id                    bigint,
@@ -11,14 +11,14 @@ create table if not exists animal (
   constraint pk_animal primary key (id)
 );
 
-create table if not exists animal_shelter (
+create table animal_shelter (
   id                            bigint generated by default as identity not null,
   name                          varchar(255),
   version                       bigint not null,
   constraint pk_animal_shelter primary key (id)
 );
 
-create table if not exists o_customer (
+create table o_customer (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
   name                          varchar(40) not null,

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.0.2</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.0.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
       <scope>test</scope>
     </dependency>
 

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdl.java

@@ -5,7 +5,6 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions;
-import io.ebeaninternal.dbmigration.migration.Column;
 
 public class ClickHouseDdl extends PlatformDdl {
 
@@ -18,16 +17,6 @@ public class ClickHouseDdl extends PlatformDdl {
     this.columnNotNull = null;
   }
 
-  @Override
-  protected String columnDefn(Column column) {
-    String defn = super.columnDefn(column);
-    if (isTrue(column.isNotnull()) || isTrue(column.isPrimaryKey())) {
-      return defn;
-    } else {
-      return "Nullable(" + defn + ")";
-    }
-  }
-
   @Override
   public DdlHandler createDdlHandler(DatabaseBuilder.Settings config) {
     return new ClickHouseDdlHandler(config, this);

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java

@@ -230,13 +230,13 @@ public class PlatformDdl {
    * Write the column definition to the create table statement.
    */
   protected void writeColumnDefinition(DdlBuffer buffer, Column column, DdlIdentity identity) {
-    buffer.append("  ");
-    buffer.append(quote(column.getName()), 29);
-
-    String columnDefn = columnDefn(column);
+    String columnDefn = convert(column.getType());
     if (identity.useIdentity() && isTrue(column.isPrimaryKey())) {
       columnDefn = asIdentityColumn(columnDefn, identity);
     }
+
+    buffer.append("  ");
+    buffer.append(quote(column.getName()), 29);
     buffer.append(columnDefn);
     if (!Boolean.TRUE.equals(column.isPrimaryKey())) {
       String defaultValue = convertDefaultValue(column.getDefaultValue());
@@ -251,13 +251,6 @@ public class PlatformDdl {
     // so that the database can potentially provide a nice SQL error
   }
 
-  /**
-   * Return the plaform specific column type definition.
-   */
-  protected String columnDefn(Column column) {
-    return convert(column.getType());
-  }
-
   /**
    * Returns the check constraint.
    */

ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ClickHousePlatformTest.java

@@ -1,28 +0,0 @@
-package io.ebeaninternal.dbmigration;
-
-import io.ebean.platform.clickhouse.ClickHousePlatform;
-import io.ebeaninternal.dbmigration.ddlgeneration.PlatformDdlBuilder;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class ClickHousePlatformTest {
-
-  @Test
-  void testTypeConversion() {
-
-    PlatformDdl ddl = PlatformDdlBuilder.create(new ClickHousePlatform());
-
-    assertThat(ddl.convert("clob")).isEqualTo("String");
-    assertThat(ddl.convert("varchar(20)")).isEqualTo("String");
-    assertThat(ddl.convert("json")).isEqualTo("JSON");
-    assertThat(ddl.convert("jsonb")).isEqualTo("JSON");
-    assertThat(ddl.convert("decimal(10)")).isEqualTo("Decimal(10)");
-    assertThat(ddl.convert("decimal(8,4)")).isEqualTo("Decimal(8,4)");
-    assertThat(ddl.convert("decimal")).isEqualTo("Decimal(16,3)");
-    assertThat(ddl.convert("boolean")).isEqualTo("Bool");
-    assertThat(ddl.convert("bit")).isEqualTo("bit");
-  }
-
-}

ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/ClickHouseDdlTest.java

@@ -1,56 +0,0 @@
-package io.ebeaninternal.dbmigration.ddlgeneration.platform;
-
-import io.ebean.platform.clickhouse.ClickHousePlatform;
-import io.ebeaninternal.dbmigration.migration.Column;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class ClickHouseDdlTest {
-
-  private final ClickHouseDdl ddl = new ClickHouseDdl(new ClickHousePlatform());
-
-  @Test
-  void convert() {
-    assertThat(ddl.convert("boolean")).isEqualTo("Bool");
-    assertThat(ddl.convert("integer")).isEqualTo("UInt32");
-    assertThat(ddl.convert("bigint")).isEqualTo("UInt64");
-    assertThat(ddl.convert("decimal(20,3)")).isEqualTo("Decimal(20,3)");
-    assertThat(ddl.convert("varchar(20)")).isEqualTo("String");
-    assertThat(ddl.convert("hstore")).isEqualTo("Map(String,String)");
-    assertThat(ddl.convert("json")).isEqualTo("JSON");
-    assertThat(ddl.convert("varchar[]")).isEqualTo("Array(String)");
-  }
-
-  @Test
-  void columnDefnNullable() {
-    Column column = new Column();
-    column.setType("varchar(20)");
-    column.setNotnull(null);
-    assertThat(ddl.columnDefn(column)).isEqualTo("Nullable(String)");
-  }
-
-  @Test
-  void columnDefnNullable2() {
-    Column column = new Column();
-    column.setType("varchar(20)");
-    column.setNotnull(Boolean.FALSE);
-    assertThat(ddl.columnDefn(column)).isEqualTo("Nullable(String)");
-  }
-
-  @Test
-  void columnDefnNotNull() {
-    Column column = new Column();
-    column.setType("varchar(20)");
-    column.setNotnull(Boolean.TRUE);
-    assertThat(ddl.columnDefn(column)).isEqualTo("String");
-  }
-
-  @Test
-  void columnDefnNotNullPrimaryKey() {
-    Column column = new Column();
-    column.setType("varchar(20)");
-    column.setPrimaryKey(Boolean.TRUE);
-    assertThat(ddl.columnDefn(column)).isEqualTo("String");
-  }
-}

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.0.2</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.0.2</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.0.2</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.0.2</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.1.0</version>
+      <version>14.0.2</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.0.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -82,11 +82,11 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.40</version>
+        <version>2.34</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.2.0</tile>
+            <tile>io.ebean.tile:enhancement:13.22.0</tile>
           </tiles>
         </configuration>
       </plugin>