[maven-release-plugin] prepare release ebean-parent-13.12.0

Bump version to 13.12.0-SNAPSHOT
#2963 - [ebean-agent] By default enable @DbArray to be nullable and @Transient field initialisation when generating default constructors
2024-04-21 10:51:47 +00:00 · 2023-02-14 08:07:07 +13:00 · 2023-02-14 08:02:35 +13:00 · 2023-02-14 08:01:48 +13:00 · 2023-02-13 22:08:30 +13:00 · 2023-02-13 15:51:31 +13:00
281 changed files with 3419 additions and 908 deletions
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-db2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-h2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-hana</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -35,18 +35,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean (all platforms)</name>
@@ -16,31 +16,31 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -53,18 +53,18 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

  </dependencies>

  <scm>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>
 </project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

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

  <name>ebean api</name>
@@ -29,7 +29,7 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-config</artifactId>
-      <version>2.2</version>
+      <version>2.4</version>
    </dependency>

    <!--
@@ -129,6 +129,11 @@ public interface DtoQuery<T> extends CancelableQuery {
   */
  DtoQuery<T> setParameter(String name, Object value);

+  /**
+   * Bind the named parameter to SQL NULL.
+   */
+  DtoQuery<T> setNullParameter(String name, int jdbcType);
+
  /**
   * Bind the named multi-value array parameter which we would use with Postgres ANY.
   * <p>
@@ -141,6 +146,11 @@ public interface DtoQuery<T> extends CancelableQuery {
   */
  DtoQuery<T> setParameter(int position, Object value);

+  /**
+   * Set a positioned parameter to SQL NULL.
+   */
+  DtoQuery<T> setNullParameter(int position, int jdbcType);
+
  /**
   * Set the index of the first row of the results to return.
   */
@@ -1730,4 +1730,8 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> endNot();

+  /**
+   * Clears the current expression list.
+   */
+  ExpressionList<T> clear();
 }
@@ -231,18 +231,6 @@ public class OrderBy<T> implements Serializable {
    return this;
  }

-  /**
-   * Return true if this order by can be used in select clause.
-   */
-  public boolean supportsSelect() {
-    for (Property property : list) {
-      if (!property.supportsSelect()) {
-        return false;
-      }
-    }
-    return true;
-  }
-
  /**
   * A property and its ascending descending order.
   */
@@ -403,12 +391,6 @@ public class OrderBy<T> implements Serializable {
      this.ascending = ascending;
    }

-    /**
-     * Support use in select clause if no collation or nulls ordering.
-     */
-    boolean supportsSelect() {
-      return nulls == null;
-    }
  }

  private void parse(String orderByClause) {
@@ -725,7 +725,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
      loader.loadBean(this);
      if (lazyLoadFailure) {
        // failed when lazy loading this bean
-        throw new EntityNotFoundException("Lazy loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted.");
+        throw new EntityNotFoundException("Lazy loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted. BeanLoader: " + beanLoader);
      }
      // bean should be loaded and intercepting now. setLoaded() has
      // been called by the lazy loading mechanism
@@ -6,7 +6,6 @@ import java.util.Set;
 * Notification event that dependent tables have been modified.
 * <p>
 * This is sent to other interested servers (in the cluster).
- * </p>
 */
 public class ServerCacheNotification {

@@ -6,7 +6,6 @@ import io.ebean.config.DatabaseConfig;
 * Plugin that provides a ServerCacheNotify implementation.
 * <p>
 * Is supplied this will be used to send the ServerCacheNotification event to other cluster members.
- * </p>
 */
 public interface ServerCacheNotifyPlugin {

@@ -32,13 +32,11 @@ import java.util.function.Function;
 * <p>
 * Used to programmatically construct an Database and optionally register it
 * with the DB singleton.
- * </p>
 * <p>
 * If you just use DB thout this programmatic configuration Ebean will read
 * the application.properties file and take the configuration from there. This usually
 * includes searching the class path and automatically registering any entity
 * classes and listeners etc.
- * </p>
 * <pre>{@code
 *
 * DatabaseConfig config = new DatabaseConfig();
@@ -58,7 +56,6 @@ import java.util.function.Function;
 * <p>
 * Note that DatabaseConfigProvider provides a standard Java ServiceLoader mechanism that can
 * be used to apply configuration to the DatabaseConfig.
- * </p>
 *
 * @author emcgreal
 * @author rbygrave
@@ -615,7 +612,7 @@ public class DatabaseConfig {
  }

  /**
-   * Put a service object into configuration such that it can be passed to a plugin.
+   * Put a service object into configuration such that it can be used by ebean or a plugin.
   * <p>
   * For example, put IgniteConfiguration in to be passed to the Ignite plugin.
   */
@@ -623,6 +620,23 @@ public class DatabaseConfig {
    serviceObject.put(key, configObject);
  }

+  /**
+   * Put a service object into configuration such that it can be used by ebean or a plugin.
+   * <p>
+   * For example, put IgniteConfiguration in to be passed to the Ignite plugin.
+   * You can also override some SPI objects that should be used for that Database. Currently, the following
+   * objects are possible.
+   * <ul>
+   *   <li>DataSourceAlertFactory (e.g. add different alert factories for different ebean instances)</li>
+   *   <li>DocStoreFactory</li>
+   *   <li>SlowQueryListener (e.g. add custom query listener for a certain ebean instance)</li>
+   *   <li>ServerCacheNotifyPlugin</li>
+   * </ul>
+   */
+  public <T> void putServiceObject(Class<T> iface, T configObject) {
+    serviceObject.put(serviceObjectKey(iface), configObject);
+  }
+
  /**
   * Return the service object given the key.
   */
@@ -631,7 +645,7 @@ public class DatabaseConfig {
  }

  /**
-   * Put a service object into configuration such that it can be passed to a plugin.
+   * Put a service object into configuration such that it can be used by ebean or a plugin.
   *
   * <pre>{@code
   *
@@ -656,7 +670,7 @@ public class DatabaseConfig {
  }

  /**
-   * Used by plugins to obtain service objects.
+   * Used by ebean or plugins to obtain service objects.
   *
   * <pre>{@code
   *
@@ -1,20 +1,16 @@
-package io.ebean.platform.db2;
+package io.ebean.config.dbplatform;

-import io.ebean.config.dbplatform.SqlLimitRequest;
-import io.ebean.config.dbplatform.SqlLimitResponse;
-import io.ebean.config.dbplatform.SqlLimiter;
-
-public class Db2SqlLimiter implements SqlLimiter {
+public final class AnsiSqlRowsLimiter implements SqlLimiter {

  @Override
  public SqlLimitResponse limit(SqlLimitRequest request) {
-
-    StringBuilder sb = new StringBuilder(512);
+    String dbSql = request.getDbSql();
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
    sb.append("select ");
    if (request.isDistinct()) {
      sb.append("distinct ");
    }
-    sb.append(request.getDbSql());
+    sb.append(dbSql);
    int firstRow = request.getFirstRow();
    if (firstRow > 0) {
      sb.append(" offset ").append(firstRow).append(" rows");
@@ -23,7 +19,6 @@ public class Db2SqlLimiter implements SqlLimiter {
    if (maxRows > 0) {
      sb.append(" fetch next ").append(maxRows).append(" rows only");
    }
-
    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
    return new SqlLimitResponse(sql);
  }
@@ -3,42 +3,25 @@ package io.ebean.config.dbplatform;
 /**
 * Adds LIMIT OFFSET clauses to a SQL query.
 */
-public class LimitOffsetSqlLimiter implements SqlLimiter {
-
-  /**
-   * LIMIT keyword.
-   */
-  private static final String LIMIT = "limit";
-
-  /**
-   * OFFSET keyword.
-   */
-  private static final String OFFSET = "offset";
+public final class LimitOffsetSqlLimiter implements SqlLimiter {

  @Override
  public SqlLimitResponse limit(SqlLimitRequest request) {
-
    String dbSql = request.getDbSql();
-
    StringBuilder sb = new StringBuilder(50 + dbSql.length());
    sb.append("select ");
    if (request.isDistinct()) {
      sb.append("distinct ");
    }
-
    sb.append(dbSql);
-
-    int firstRow = request.getFirstRow();
    int maxRows = request.getMaxRows();
-
-    if (maxRows > 0 || firstRow > 0) {
-      sb.append(" ").append(LIMIT).append(" ").append(maxRows);
-      if (firstRow > 0) {
-        sb.append(" ").append(OFFSET).append(" ");
-        sb.append(firstRow);
-      }
+    if (maxRows > 0) {
+      sb.append(" limit ").append(maxRows);
+    }
+    int firstRow = request.getFirstRow();
+    if (firstRow > 0) {
+      sb.append(" offset ").append(firstRow);
    }
-
    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
    return new SqlLimitResponse(sql);
  }
@@ -5,14 +5,6 @@ package io.ebean.config.dbplatform;
 */
 public interface SqlLimiter {

-  /**
-   * the new line character used.
-   * <p>
-   * Note that this is removed for logging sql to the transaction log.
-   * </p>
-   */
-  char NEW_LINE = '\n';
-
  /**
   * Add the SQL limiting statements around the query.
   */
@@ -0,0 +1 @@
+ebean-version: 142
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>

  <name>ebean autotune</name>
@@ -26,7 +26,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

@@ -55,7 +55,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

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

  <name>ebean bom</name>
@@ -89,106 +89,174 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-joda-time</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
        <scope>test</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>13.10.1</version>
+        <version>13.12.0</version>
+      </dependency>
+
+      <!-- platforms -->
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-clickhouse</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-db2</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-h2</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-hana</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-mariadb</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-mysql</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-nuodb</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-oracle</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-postgres</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-sqlite</artifactId>
+        <version>13.12.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-sqlserver</artifactId>
+        <version>13.12.0</version>
      </dependency>

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

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

    <dependency>
@@ -30,7 +30,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.4.1</version>
+      <version>42.4.3</version>
      <optional>true</optional>
    </dependency>

@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -15,14 +15,14 @@

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>

  <dependencies>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -46,13 +46,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -135,7 +135,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.5.0</version>
+      <version>42.5.1</version>
      <optional>true</optional>
    </dependency>

@@ -143,21 +143,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

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

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

@@ -9,4 +9,5 @@ public final class CoreLog {

  public static final System.Logger log = AppLog.getLogger("io.ebean.core");
  public static final System.Logger internal = AppLog.getLogger("io.ebean.internal");
+  public static final System.Logger markedAsDeleted = AppLog.getLogger("io.ebean.MarkedAsDeleted");
 }
@@ -6,10 +6,7 @@ import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;

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

 /**
 * Request for loading ManyToOne and OneToOne relationships.
@@ -103,7 +100,7 @@ public final class LoadBeanRequest extends LoadRequest {
  /**
   * Load the beans into the L2 cache if that is requested and check for load failures due to deletes.
   */
-  public void postLoad(List<?> list) {
+  public Result postLoad(List<?> list) {
    Set<Object> loadedIds = new HashSet<>();
    BeanDescriptor<?> desc = loadBuffer.descriptor();
    // collect Ids and maybe load bean cache
@@ -114,6 +111,7 @@ public final class LoadBeanRequest extends LoadRequest {
      desc.cacheBeanPutAll(list);
    }
    if (lazyLoadProperty != null) {
+      Set<Object> missedIds = new HashSet<>();
      for (EntityBeanIntercept ebi : batch) {
        // check if the underlying row in DB was deleted. Mark the bean as 'failed' if
        // necessary but allow processing to continue until it is accessed by client code
@@ -121,8 +119,36 @@ public final class LoadBeanRequest extends LoadRequest {
        if (!loadedIds.contains(id)) {
          // assume this is logically deleted (hence not found)
          desc.markAsDeleted(ebi.getOwner());
+          missedIds.add(id);
        }
      }
+      return new Result(loadedIds, missedIds);
+    }
+    return EMPTY_RESULT;
+  }
+
+  static final Result EMPTY_RESULT = new Result(Collections.emptySet(),Collections.emptySet());
+
+  public static class Result {
+
+    private final Set<Object> loadedIds;
+    private final Set<Object> missedIds;
+
+    Result(Set<Object> loadedIds, Set<Object> missedIds) {
+      this.loadedIds = loadedIds;
+      this.missedIds = missedIds;
+    }
+
+    public boolean markedDeleted() {
+      return !missedIds.isEmpty();
+    }
+
+    public Set<Object> missedIds() {
+      return missedIds;
+    }
+
+    public Set<Object> loadedIds() {
+      return loadedIds;
    }
  }
 }
@@ -120,7 +120,7 @@ public final class LoadManyRequest extends LoadRequest {
          log.log(DEBUG, "BeanCollection after lazy load was empty. type:{0} id:{1} owner:{2}", ownerBean.getClass().getName(), parentId, ownerBean);
        }
      } else if (loadCache && many.isUseCache()) {
-        desc.cacheManyPropPut(many, bc, desc.getId(bc.getOwnerBean()));
+        desc.cacheManyPropPut(many, bc, desc.cacheKeyForBean(bc.getOwnerBean()));
      }
    }
  }
@@ -759,6 +759,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  BindParams getBindParams();

+  /**
+   * Return the bind parameters ensuring it is initialised.
+   */
+  BindParams initBindParams();
+
  /**
   * Replace the query detail. This is used by the AutoTune feature to as a
   * fast way to set the query properties and joins.
@@ -115,88 +115,88 @@ public class DataBind implements DataBinder {
  }

  @Override
-  public void setString(String s) throws SQLException {
-    pstmt.setString(++pos, s);
+  public void setString(String value) throws SQLException {
+    pstmt.setString(++pos, value);
  }

  @Override
-  public final void setInt(int i) throws SQLException {
-    pstmt.setInt(++pos, i);
+  public final void setInt(int value) throws SQLException {
+    pstmt.setInt(++pos, value);
  }

  @Override
-  public final void setLong(long i) throws SQLException {
-    pstmt.setLong(++pos, i);
+  public final void setLong(long value) throws SQLException {
+    pstmt.setLong(++pos, value);
  }

  @Override
-  public final void setShort(short i) throws SQLException {
-    pstmt.setShort(++pos, i);
+  public final void setShort(short value) throws SQLException {
+    pstmt.setShort(++pos, value);
  }

  @Override
-  public final void setFloat(float i) throws SQLException {
-    pstmt.setFloat(++pos, i);
+  public final void setFloat(float value) throws SQLException {
+    pstmt.setFloat(++pos, value);
  }

  @Override
-  public final void setDouble(double i) throws SQLException {
-    pstmt.setDouble(++pos, i);
+  public final void setDouble(double value) throws SQLException {
+    pstmt.setDouble(++pos, value);
  }

  @Override
-  public final void setBigDecimal(BigDecimal v) throws SQLException {
-    pstmt.setBigDecimal(++pos, v);
+  public final void setBigDecimal(BigDecimal value) throws SQLException {
+    pstmt.setBigDecimal(++pos, value);
  }

  @Override
-  public final void setDate(java.sql.Date v) throws SQLException {
+  public final void setDate(java.sql.Date value) throws SQLException {
    Calendar timeZone = dataTimeZone.getTimeComponentTimeZone();
    if (timeZone != null) {
-      pstmt.setDate(++pos, v, timeZone);
+      pstmt.setDate(++pos, value, timeZone);
    } else {
-      pstmt.setDate(++pos, v);
+      pstmt.setDate(++pos, value);
    }
  }

  @Override
-  public final void setTimestamp(Timestamp v) throws SQLException {
+  public final void setTimestamp(Timestamp value) throws SQLException {
    Calendar timeZone = dataTimeZone.getTimeZone();
    if (timeZone != null) {
-      pstmt.setTimestamp(++pos, v, timeZone);
+      pstmt.setTimestamp(++pos, value, timeZone);
    } else {
-      pstmt.setTimestamp(++pos, v);
+      pstmt.setTimestamp(++pos, value);
    }
  }

  @Override
-  public final void setTime(Time v) throws SQLException {
+  public final void setTime(Time value) throws SQLException {
    Calendar timeZone = dataTimeZone.getTimeComponentTimeZone();
    if (timeZone != null) {
-      pstmt.setTime(++pos, v, timeZone);
+      pstmt.setTime(++pos, value, timeZone);
    } else {
-      pstmt.setTime(++pos, v);
+      pstmt.setTime(++pos, value);
    }
  }

  @Override
-  public void setBoolean(boolean v) throws SQLException {
-    pstmt.setBoolean(++pos, v);
+  public void setBoolean(boolean value) throws SQLException {
+    pstmt.setBoolean(++pos, value);
  }

  @Override
-  public void setBytes(byte[] v) throws SQLException {
-    pstmt.setBytes(++pos, v);
+  public void setBytes(byte[] value) throws SQLException {
+    pstmt.setBytes(++pos, value);
  }

  @Override
-  public void setByte(byte v) throws SQLException {
-    pstmt.setByte(++pos, v);
+  public void setByte(byte value) throws SQLException {
+    pstmt.setByte(++pos, value);
  }

  @Override
-  public void setChar(char v) throws SQLException {
-    pstmt.setString(++pos, String.valueOf(v));
+  public void setChar(char value) throws SQLException {
+    pstmt.setString(++pos, String.valueOf(value));
  }

  @Override
@@ -215,20 +215,17 @@ public class DataBind implements DataBinder {

  @Override
  public void setBlob(byte[] bytes) throws SQLException {
-    ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-    pstmt.setBinaryStream(++pos, is, bytes.length);
+    pstmt.setBinaryStream(++pos, new ByteArrayInputStream(bytes), bytes.length);
  }

  @Override
  public void setClob(String content) throws SQLException {
-    Reader reader = new StringReader(content);
-    pstmt.setCharacterStream(++pos, reader, content.length());
+    pstmt.setCharacterStream(++pos, new StringReader(content), content.length());
  }

  @Override
  public void setArray(String arrayType, Object[] elements) throws SQLException {
-    Array array = connection.createArrayOf(arrayType, elements);
-    pstmt.setArray(++pos, array);
+    pstmt.setArray(++pos, connection.createArrayOf(arrayType, elements));
  }

 }
@@ -33,87 +33,87 @@ public final class BindCaptureStatement extends BindCaptureStatementBase impleme
  }

  @Override
-  public void setBoolean(int parameterIndex, boolean x) {
-    capture.add(new BindCaptureTypes.Boolean(parameterIndex, x));
+  public void setBoolean(int parameterIndex, boolean value) {
+    capture.add(new BindCaptureTypes.Boolean(parameterIndex, value));
  }

  @Override
-  public void setByte(int parameterIndex, byte x) {
-    capture.add(new BindCaptureTypes.Byte(parameterIndex, x));
+  public void setByte(int parameterIndex, byte value) {
+    capture.add(new BindCaptureTypes.Byte(parameterIndex, value));
  }

  @Override
-  public void setShort(int parameterIndex, short x) {
-    capture.add(new BindCaptureTypes.TShort(parameterIndex, x));
+  public void setShort(int parameterIndex, short value) {
+    capture.add(new BindCaptureTypes.TShort(parameterIndex, value));
  }

  @Override
-  public void setInt(int parameterIndex, int x) {
-    capture.add(new BindCaptureTypes.TInt(parameterIndex, x));
+  public void setInt(int parameterIndex, int value) {
+    capture.add(new BindCaptureTypes.TInt(parameterIndex, value));
  }

  @Override
-  public void setLong(int parameterIndex, long x) {
-    capture.add(new BindCaptureTypes.TLong(parameterIndex, x));
+  public void setLong(int parameterIndex, long value) {
+    capture.add(new BindCaptureTypes.TLong(parameterIndex, value));
  }

  @Override
-  public void setFloat(int parameterIndex, float x) {
-    capture.add(new BindCaptureTypes.TFloat(parameterIndex, x));
+  public void setFloat(int parameterIndex, float value) {
+    capture.add(new BindCaptureTypes.TFloat(parameterIndex, value));
  }

  @Override
-  public void setDouble(int parameterIndex, double x) {
-    capture.add(new BindCaptureTypes.TDouble(parameterIndex, x));
+  public void setDouble(int parameterIndex, double value) {
+    capture.add(new BindCaptureTypes.TDouble(parameterIndex, value));
  }

  @Override
-  public void setBigDecimal(int parameterIndex, BigDecimal x) {
-    capture.add(new BindCaptureTypes.TBigDecimal(parameterIndex, x));
+  public void setBigDecimal(int parameterIndex, BigDecimal value) {
+    capture.add(new BindCaptureTypes.TBigDecimal(parameterIndex, value));
  }

  @Override
-  public void setString(int parameterIndex, String x) {
-    capture.add(new BindCaptureTypes.TString(parameterIndex, x));
+  public void setString(int parameterIndex, String value) {
+    capture.add(new BindCaptureTypes.TString(parameterIndex, value));
  }

  @Override
-  public void setBytes(int parameterIndex, byte[] x) {
-    capture.add(new BindCaptureTypes.Bytes(parameterIndex, x));
+  public void setBytes(int parameterIndex, byte[] value) {
+    capture.add(new BindCaptureTypes.Bytes(parameterIndex, value));
  }

  @Override
-  public void setDate(int parameterIndex, Date x) {
-    capture.add(new BindCaptureTypes.TDate(parameterIndex, x));
+  public void setDate(int parameterIndex, Date value) {
+    capture.add(new BindCaptureTypes.TDate(parameterIndex, value));
  }

  @Override
-  public void setTime(int parameterIndex, Time x) {
-    capture.add(new BindCaptureTypes.TTime(parameterIndex, x));
+  public void setTime(int parameterIndex, Time value) {
+    capture.add(new BindCaptureTypes.TTime(parameterIndex, value));
  }

  @Override
-  public void setTimestamp(int parameterIndex, Timestamp x) {
-    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, x, null));
+  public void setTimestamp(int parameterIndex, Timestamp value) {
+    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, value, null));
  }

  @Override
-  public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) {
-    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, x, cal));
+  public void setTimestamp(int parameterIndex, Timestamp value, Calendar cal) {
+    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, value, cal));
  }

  @Override
-  public void setObject(int parameterIndex, Object x) {
-    capture.add(new BindCaptureTypes.TObject(parameterIndex, x));
+  public void setObject(int parameterIndex, Object value) {
+    capture.add(new BindCaptureTypes.TObject(parameterIndex, value));
  }

  @Override
-  public void setBinaryStream(int parameterIndex, InputStream x, int length) {
+  public void setBinaryStream(int parameterIndex, InputStream value, int length) {
    capture.add(new BindCaptureTypes.BinaryStream(parameterIndex));
  }

  @Override
-  public void setCharacterStream(int parameterIndex, Reader reader, int length) {
+  public void setCharacterStream(int parameterIndex, Reader value, int length) {
    capture.add(new BindCaptureTypes.CharacterStream(parameterIndex));
  }

@@ -91,15 +91,15 @@ public final class CacheChangeSet {
  /**
   * Add many property remove.
   */
-  public <T> void addManyRemove(BeanDescriptor<T> desc, String manyProperty, Object parentId) {
-    many(desc, manyProperty).addRemove(parentId);
+  public <T> void addManyRemove(BeanDescriptor<T> desc, String manyProperty, String parentKey) {
+    many(desc, manyProperty).addRemove(parentKey);
  }

  /**
   * Add many property put.
   */
-  public <T> void addManyPut(BeanDescriptor<T> desc, String manyProperty, Object parentId, CachedManyIds entry) {
-    many(desc, manyProperty).addPut(parentId, entry);
+  public <T> void addManyPut(BeanDescriptor<T> desc, String manyProperty, String parentKey, CachedManyIds entry) {
+    many(desc, manyProperty).addPut(parentKey, entry);
  }

  /**
@@ -164,8 +164,8 @@ public final class CacheChangeSet {
  private static final class ManyChange implements CacheChange {

    final ManyKey key;
-    final Set<Object> removes = new HashSet<>();
-    final Map<Object, CachedManyIds> puts = new LinkedHashMap<>();
+    final Set<String> removes = new HashSet<>();
+    final Map<String, CachedManyIds> puts = new LinkedHashMap<>();
    boolean clear;

    ManyChange(ManyKey key) {
@@ -183,17 +183,17 @@ public final class CacheChangeSet {
    /**
     * Remove entry for the given parentId.
     */
-    void addRemove(Object parentId) {
+    void addRemove(String parentKey) {
      if (!clear) {
-        removes.add(parentId);
+        removes.add(parentKey);
      }
    }

    /**
     * Put entry for the given parentId.
     */
-    void addPut(Object parentId, CachedManyIds entry) {
-      puts.put(parentId, entry);
+    void addPut(String parentKey, CachedManyIds entry) {
+      puts.put(parentKey, entry);
    }

    @Override
@@ -201,11 +201,11 @@ public final class CacheChangeSet {
      if (clear) {
        key.cacheClear();
      } else {
-        for (Map.Entry<Object, CachedManyIds> entry : puts.entrySet()) {
+        for (Map.Entry<String, CachedManyIds> entry : puts.entrySet()) {
          key.cachePut(entry.getKey(), entry.getValue());
        }
-        for (Object parentId : removes) {
-          key.cacheRemove(parentId);
+        for (String parentKey : removes) {
+          key.cacheRemove(parentKey);
        }
      }
    }
@@ -241,12 +241,12 @@ public final class CacheChangeSet {
      desc.cacheManyPropClear(manyProperty);
    }

-    void cachePut(Object parentId, CachedManyIds entry) {
-      desc.cacheManyPropPut(manyProperty, parentId, entry);
+    void cachePut(String parentKey, CachedManyIds entry) {
+      desc.cacheManyPropPut(manyProperty, parentKey, entry);
    }

-    void cacheRemove(Object parentId) {
-      desc.cacheManyPropRemove(manyProperty, parentId);
+    void cacheRemove(String parentKey) {
+      desc.cacheManyPropRemove(manyProperty, parentKey);
    }
  }
 }
@@ -130,7 +130,7 @@ final class DefaultCacheHolder {
  }

  private ServerCacheOptions getQueryOptions(Class<?> cls) {
-    CacheQueryTuning tuning = AnnotationUtil.get(cls, CacheQueryTuning.class);
+    CacheQueryTuning tuning = AnnotationUtil.typeGet(cls, CacheQueryTuning.class);
    if (tuning != null) {
      return new ServerCacheOptions(tuning).applyDefaults(queryDefault);
    }
@@ -138,9 +138,9 @@ final class DefaultCacheHolder {
  }

  private ServerCacheOptions getBeanOptions(Class<?> cls) {
-    Cache cache = cls.getAnnotation(Cache.class);
+    Cache cache = AnnotationUtil.typeGet(cls, Cache.class);
    boolean nearCache = (cache != null && cache.nearCache());
-    CacheBeanTuning tuning = cls.getAnnotation(CacheBeanTuning.class);
+    CacheBeanTuning tuning = AnnotationUtil.typeGet(cls, CacheBeanTuning.class);
    if (tuning != null) {
      return new ServerCacheOptions(nearCache, tuning).applyDefaults(beanDefault);
    }
@@ -14,10 +14,11 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;

 import javax.persistence.EntityNotFoundException;
+import java.text.MessageFormat;
 import java.util.List;
 import java.util.Set;

-import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.*;

 /**
 * Helper to handle lazy loading and refreshing of beans.
@@ -72,7 +73,8 @@ final class DefaultBeanLoader {
      if (ebi.isReadOnly()) {
        readOnly = Boolean.TRUE;
      }
-      if (parentDesc.cacheManyPropLoad(many, beanCollection, parentId, readOnly)) {
+      final String parentKey = parentDesc.cacheKey(parentId);
+      if (parentDesc.cacheManyPropLoad(many, beanCollection, parentKey, readOnly)) {
        return;
      }
    }
@@ -113,7 +115,8 @@ final class DefaultBeanLoader {
          log.log(DEBUG, "BeanCollection after load was empty. Owner:{0}", beanCollection.getOwnerBean());
        }
      } else if (useManyIdCache) {
-        parentDesc.cacheManyPropPut(many, beanCollection, parentId);
+        final String parentKey = parentDesc.cacheKey(parentId);
+        parentDesc.cacheManyPropPut(many, beanCollection, parentKey);
      }
    }
  }
@@ -135,8 +138,12 @@ final class DefaultBeanLoader {

    SpiQuery<?> query = server.createQuery(loadRequest.beanType());
    loadRequest.configureQuery(query, idList);
-    List<?> list = executeQuery(loadRequest, query);
-    loadRequest.postLoad(list);
+    final List<?> list = executeQuery(loadRequest, query);
+    final LoadBeanRequest.Result result = loadRequest.postLoad(list);
+    if (result.markedDeleted() && CoreLog.markedAsDeleted.isLoggable(DEBUG)) {
+      String msg = MessageFormat.format("Loaded bean marked as deleted for {0} missedIds:{1} loadedIds:{2} sql:{3} list:{4}", loadRequest.beanType(), result.missedIds(), result.loadedIds(), query.getGeneratedSql(), list);
+      CoreLog.markedAsDeleted.log(DEBUG, msg, new RuntimeException("LoadBeanRequest markedAsDeleted"));
+    }
  }

  /**
@@ -160,6 +160,8 @@ public final class DefaultContainer implements SpiContainer {
   */
  private BootupClasses bootupClasses(DatabaseConfig config) {
    BootupClasses bootup = bootupClasses1(config);
+    bootup.addServerConfigStartup(config.getServerConfigStartupListeners());
+    bootup.runServerConfigStartup(config);
    bootup.addIdGenerators(config.getIdGenerators());
    bootup.addPersistControllers(config.getPersistControllers());
    bootup.addPostLoaders(config.getPostLoaders());
@@ -167,9 +169,7 @@ public final class DefaultContainer implements SpiContainer {
    bootup.addFindControllers(config.getFindControllers());
    bootup.addPersistListeners(config.getPersistListeners());
    bootup.addQueryAdapters(config.getQueryAdapters());
-    bootup.addServerConfigStartup(config.getServerConfigStartupListeners());
    bootup.addChangeLogInstances(config);
-    bootup.runServerConfigStartup(config);
    return bootup;
  }

@@ -307,7 +307,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   */
  public void start() {
    if (config.isRunMigration() && TenantMode.DB != config.getTenantMode()) {
-      final AutoMigrationRunner migrationRunner = ServiceUtil.service(AutoMigrationRunner.class);
+      AutoMigrationRunner migrationRunner = config.getServiceObject(AutoMigrationRunner.class);
+      if (migrationRunner == null) {
+        migrationRunner = ServiceUtil.service(AutoMigrationRunner.class);
+      }
      if (migrationRunner == null) {
        throw new IllegalStateException("No AutoMigrationRunner found. Probably ebean-migration is not in the classpath?");
      }
@@ -1088,7 +1091,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  @Override
  @SuppressWarnings({"unchecked", "rawtypes"})
  public <T> Set<T> findSet(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest request = createQueryRequest(Type.SET, query, transaction);
+    SpiOrmQueryRequest request = buildQueryRequest(Type.SET, query, transaction);
+    request.resetBeanCacheAutoMode(false);
+    if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) {
+      // hit bean cache and got all results from cache
+      return request.beanCacheHitsAsSet();
+    }
+    request.prepareQuery();
    Object result = request.getFromQueryCache();
    if (result != null) {
      return (Set<T>) result;
@@ -1104,12 +1113,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  @Override
  @SuppressWarnings({"unchecked", "rawtypes"})
  public <K, T> Map<K, T> findMap(Query<T> query, @Nullable Transaction transaction) {
-    SpiOrmQueryRequest request = createQueryRequest(Type.MAP, query, transaction);
+    SpiOrmQueryRequest request = buildQueryRequest(Type.MAP, query, transaction);
    request.resetBeanCacheAutoMode(false);
    if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) {
      // hit bean cache and got all results from cache
      return request.beanCacheHitsAsMap();
    }
+    request.prepareQuery();
    Object result = request.getFromQueryCache();
    if (result != null) {
      return (Map<K, T>) result;
@@ -117,7 +117,10 @@ final class InitDataSource {
   * Attach DataSourceAlert via service loader if present.
   */
  private void attachAlert(DataSourceConfig dsConfig) {
-    DataSourceAlertFactory alertFactory = ServiceUtil.service(DataSourceAlertFactory.class);
+    DataSourceAlertFactory alertFactory = config.getServiceObject(DataSourceAlertFactory.class);
+    if (alertFactory == null) {
+      alertFactory = ServiceUtil.service(DataSourceAlertFactory.class);
+    }
    if (alertFactory != null) {
      dsConfig.setAlert(alertFactory.createAlert());
    }
@@ -144,7 +144,12 @@ public final class InternalConfiguration {
  }

  private <S> S service(Class<S> cls) {
-    return ServiceUtil.service(cls);
+    S service = config.getServiceObject(cls);
+    if (service != null) {
+      return service;
+    } else {
+      return ServiceUtil.service(cls);
+    }
  }

  private List<XmapEbean> readExternalMapping() {
@@ -515,12 +515,12 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
      if (query.getType() == Type.MAP) {
        mergeCacheHitsToMap(result);
      } else {
-        mergeCacheHitsToList(result);
+        mergeCacheHitsToCollection(result);
      }
    }
  }

-  private void mergeCacheHitsToList(BeanCollection<T> result) {
+  private void mergeCacheHitsToCollection(BeanCollection<T> result) {
    for (T hit : cacheBeans) {
      result.internalAdd(hit);
    }
@@ -579,6 +579,15 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return property;
  }

+  @Override
+  public Set<T> beanCacheHitsAsSet() {
+    OrderBy<T> orderBy = query.getOrderBy();
+    if (orderBy != null && !orderBy.isEmpty()) {
+      beanDescriptor.sort(cacheBeans, orderBy.toStringFormat());
+    }
+    return new LinkedHashSet<>(cacheBeans);
+  }
+
  @Override
  public boolean getFromBeanCache() {
    if (!query.isBeanCacheGet()) {
@@ -153,6 +153,11 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequ
   */
  <K> Map<K,T> beanCacheHitsAsMap();

+  /**
+   * Return the bean cache hits for findMap (when all hits / no misses).
+   */
+  Set<T> beanCacheHitsAsSet();
+
  /**
   * Reset Bean cache mode AUTO - require explicit setting for bean cache use with findList().
   */
@@ -342,8 +342,9 @@ public class BootupClasses implements Predicate<Class<?>> {
   */
  @SuppressWarnings("unchecked")
  private boolean isInterestingInterface(Class<?> cls) {
-    if (Modifier.isAbstract(cls.getModifiers())) {
-      // do not include abstract classes as we can
+    if (Modifier.isAbstract(cls.getModifiers())
+      || !(Modifier.isPublic(cls.getModifiers()) || Modifier.isProtected(cls.getModifiers()))) {
+      // do not include abstract and non pupbic/protected classes as we can
      // not instantiate them
      return false;
    }
@@ -38,13 +38,10 @@ public final class BeanCollectionUtil {
      // returns a collection of beans
      return bc.getActualEntries();
    }
-
-    if (o instanceof Map<?, ?>) {
-      // yes, we want the entrySet (to set the keys)
-      return ((Map<?, ?>) o).entrySet();
-
-    } else if (o instanceof Collection<?>) {
+    if (o instanceof Collection<?>) {
      return ((Collection<?>) o);
+    } else if (o instanceof Map<?, ?>) {
+      return ((Map<?, ?>) o).entrySet();
    }
    throw new PersistenceException("expecting a Map or Collection but got " + o.getClass().getName());
  }
@@ -1202,26 +1202,26 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
  /**
   * Try to load the beanCollection from cache return true if successful.
   */
-  public boolean cacheManyPropLoad(BeanPropertyAssocMany<?> many, BeanCollection<?> bc, Object parentId, Boolean readOnly) {
-    return cacheHelp.manyPropLoad(many, bc, parentId, readOnly);
+  public boolean cacheManyPropLoad(BeanPropertyAssocMany<?> many, BeanCollection<?> bc, String parentKey, Boolean readOnly) {
+    return cacheHelp.manyPropLoad(many, bc, parentKey, readOnly);
  }

  /**
   * Put the beanCollection into the cache.
   */
-  public void cacheManyPropPut(BeanPropertyAssocMany<?> many, BeanCollection<?> bc, Object parentId) {
-    cacheHelp.manyPropPut(many, bc, parentId);
+  public void cacheManyPropPut(BeanPropertyAssocMany<?> many, BeanCollection<?> bc, String parentKey) {
+    cacheHelp.manyPropPut(many, bc, parentKey);
  }

  /**
   * Update the bean collection entry in the cache.
   */
-  public void cacheManyPropPut(String name, Object parentId, CachedManyIds entry) {
-    cacheHelp.cachePutManyIds(parentId, name, entry);
+  public void cacheManyPropPut(String name, String parentKey, CachedManyIds entry) {
+    cacheHelp.cachePutManyIds(name, parentKey, entry);
  }

-  public void cacheManyPropRemove(String propertyName, Object parentId) {
-    cacheHelp.manyPropRemove(propertyName, parentId);
+  public void cacheManyPropRemove(String propertyName, String parentKey) {
+    cacheHelp.manyPropRemove(propertyName, parentKey);
  }

  public void cacheManyPropClear(String propertyName) {
@@ -2096,7 +2096,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
  /**
   * Return the cache key for the given bean (based on id value).
   */
-  String cacheKeyForBean(EntityBean bean) {
+  public String cacheKeyForBean(EntityBean bean) {
    return cacheKey(idProperty.getValue(bean));
  }

@@ -2112,11 +2112,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    return getId((EntityBean) bean);
  }

-//  @Override
-//  public Object beanId(T bean) {
-//    return getId((EntityBean) bean);
-//  }
-
  /**
   * Return the Id value for the bean with embeddedId beans converted into maps.
   * <p>
@@ -226,13 +226,12 @@ final class BeanDescriptorCacheHelp<T> {
    queryCache.put(id, entry);
  }

-
-  void manyPropRemove(String propertyName, Object parentId) {
+  void manyPropRemove(String propertyName, String parentKey) {
    ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, propertyName);
    if (manyLog.isLoggable(TRACE)) {
-      manyLog.log(TRACE, "   REMOVE {0}({1}).{2}", cacheName, parentId, propertyName);
+      manyLog.log(TRACE, "   REMOVE {0}({1}).{2}", cacheName, parentKey, propertyName);
    }
-    collectionIdsCache.remove(parentId);
+    collectionIdsCache.remove(parentKey);
  }

  void manyPropClear(String propertyName) {
@@ -246,15 +245,15 @@ final class BeanDescriptorCacheHelp<T> {
  /**
   * Return the CachedManyIds for a given bean many property. Returns null if not in the cache.
   */
-  private CachedManyIds manyPropGet(Object parentId, String propertyName) {
+  private CachedManyIds manyPropGet(String propertyName, String parentKey) {
    ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, propertyName);
-    CachedManyIds entry = (CachedManyIds) collectionIdsCache.get(parentId);
+    CachedManyIds entry = (CachedManyIds) collectionIdsCache.get(parentKey);
    if (entry == null) {
      if (manyLog.isLoggable(TRACE)) {
-        manyLog.log(TRACE, "   GET {0}({1}).{2} - cache miss", cacheName, parentId, propertyName);
+        manyLog.log(TRACE, "   GET {0}({1}).{2} - cache miss", cacheName, parentKey, propertyName);
      }
    } else if (manyLog.isLoggable(DEBUG)) {
-      manyLog.log(DEBUG, "   GET {0}({1}).{2} - hit", cacheName, parentId, propertyName);
+      manyLog.log(DEBUG, "   GET {0}({1}).{2} - hit", cacheName, parentKey, propertyName);
    }
    return entry;
  }
@@ -262,12 +261,12 @@ final class BeanDescriptorCacheHelp<T> {
  /**
   * Try to load the bean collection from cache return true if successful.
   */
-  boolean manyPropLoad(BeanPropertyAssocMany<?> many, BeanCollection<?> bc, Object parentId, Boolean readOnly) {
+  boolean manyPropLoad(BeanPropertyAssocMany<?> many, BeanCollection<?> bc, String parentKey, Boolean readOnly) {
    if (many.isElementCollection()) {
      // held as part of the bean cache so skip
      return false;
    }
-    CachedManyIds entry = manyPropGet(parentId, many.name());
+    CachedManyIds entry = manyPropGet(many.name(), parentKey);
    if (entry == null) {
      // not in cache so return unsuccessful
      return false;
@@ -293,9 +292,9 @@ final class BeanDescriptorCacheHelp<T> {
  /**
   * Put the beanCollection into the cache.
   */
-  void manyPropPut(BeanPropertyAssocMany<?> many, Object details, Object parentId) {
+  void manyPropPut(BeanPropertyAssocMany<?> many, Object details, String parentKey) {
    if (many.isElementCollection()) {
-      CachedBeanData data = (CachedBeanData) beanCache.get(parentId);
+      CachedBeanData data = (CachedBeanData) beanCache.get(parentKey);
      if (data != null) {
        try {
          // add as JSON to bean cache
@@ -305,9 +304,9 @@ final class BeanDescriptorCacheHelp<T> {

          CachedBeanData newData = data.update(changes, data.getVersion());
          if (beanLog.isLoggable(DEBUG)) {
-            beanLog.log(DEBUG, "   UPDATE {0}({1})  changes:{2}", cacheName, parentId, changes);
+            beanLog.log(DEBUG, "   UPDATE {0}({1})  changes:{2}", cacheName, parentKey, changes);
          }
-          beanCache.put(parentId, newData);
+          beanCache.put(parentKey, newData);
        } catch (IOException e) {
          log.log(ERROR, "Error updating L2 cache", e);
        }
@@ -315,17 +314,17 @@ final class BeanDescriptorCacheHelp<T> {
    } else {
      CachedManyIds entry = createManyIds(many, details);
      if (entry != null) {
-        cachePutManyIds(parentId, many.name(), entry);
+        cachePutManyIds(many.name(), parentKey, entry);
      }
    }
  }

-  void cachePutManyIds(Object parentId, String manyName, CachedManyIds entry) {
+  void cachePutManyIds(String manyName, String parentKey, CachedManyIds entry) {
    ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, manyName);
    if (manyLog.isLoggable(DEBUG)) {
-      manyLog.log(DEBUG, "   PUT {0}({1}).{2} - ids:{3}", cacheName, parentId, manyName, entry);
+      manyLog.log(DEBUG, "   PUT {0}({1}).{2} - ids:{3}", cacheName, parentKey, manyName, entry);
    }
-    collectionIdsCache.put(parentId, entry);
+    collectionIdsCache.put(parentKey, entry);
  }

  private CachedManyIds createManyIds(BeanPropertyAssocMany<?> many, Object details) {
@@ -828,7 +827,8 @@ final class BeanDescriptorCacheHelp<T> {
          Object details = many.getValue(updateRequest.entityBean());
          CachedManyIds entry = createManyIds(many, details);
          if (entry != null) {
-            changeSet.addManyPut(desc, many.name(), id, entry);
+            final String parentKey = desc.cacheKey(id);
+            changeSet.addManyPut(desc, many.name(), parentKey, entry);
          }
        }
      }
@@ -65,7 +65,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
  /**
   * Flag to mark this is the id property.
   */
-  private final boolean id;
+  protected final boolean id;
  private final boolean importedPrimaryKey;
  /**
   * Flag to make this as a dummy property for unidirecitonal relationships.
@@ -197,7 +197,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
        if (assocBean != null) {
          Object parentId = targetDescriptor.id(assocBean);
          if (parentId != null) {
-            changeSet.addManyRemove(targetDescriptor, relationshipProperty.name(), parentId);
+            final String parentKey = targetDescriptor.cacheKey(parentId);
+            changeSet.addManyRemove(targetDescriptor, relationshipProperty.name(), parentKey);
          }
        }
      }
@@ -655,7 +656,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
  @Override
  public void setValue(EntityBean bean, Object value) {
    super.setValue(bean, value);
-    if (embedded && value instanceof EntityBean) {
+    if (!id && embedded && value instanceof EntityBean) {
      setEmbeddedOwner(bean, value);
    }
  }
@@ -663,7 +664,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
  @Override
  public void setValueIntercept(EntityBean bean, Object value) {
    super.setValueIntercept(bean, value);
-    if (embedded && value instanceof EntityBean) {
+    if (!id && embedded && value instanceof EntityBean) {
      setEmbeddedOwner(bean, value);
    }
  }
@@ -675,8 +676,10 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
    Object emb = getValue(owner);
    if (emb != null) {
      EntityBean embeddedBean = (EntityBean) emb;
-      embeddedBean._ebean_getIntercept().setEmbeddedOwner(owner, propertyIndex);
      targetDescriptor.setAllLoaded(embeddedBean);
+      if (!id) {
+        embeddedBean._ebean_getIntercept().setEmbeddedOwner(owner, propertyIndex);
+      }
    }
  }

@@ -1123,7 +1123,7 @@ public class DeployBeanProperty {

  private boolean matchPlatform(Platform[] platforms, Platform match) {
    for (Platform platform : platforms) {
-      if (platform == match) {
+      if (platform == match || platform == match.base()) {
        return true;
      }
    }
@@ -465,10 +465,9 @@ final class AnnotationFields extends AnnotationParser {
      if (!gen.generator().isEmpty()) {
        // use a custom IdGenerator
        PlatformIdGenerator idGenerator = generatedPropFactory.getIdGenerator(gen.generator());
-        if (idGenerator == null) {
-          throw new IllegalStateException("No custom IdGenerator registered with name " + gen.generator());
+        if (idGenerator != null) {
+          descriptor.setCustomIdGenerator(idGenerator);
        }
-        descriptor.setCustomIdGenerator(idGenerator);
      } else if (prop.getPropertyType().equals(UUID.class)) {
        descriptor.setUuidGenerator();
      }
@@ -1268,4 +1268,10 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
    }
    return null;
  }
+
+  @Override
+  public ExpressionList<T> clear() {
+    list.clear();
+    return this;
+  }
 }
@@ -14,17 +14,13 @@ import java.util.*;

 public final class InExpression extends AbstractExpression implements IdInCommon {

-  private final boolean not;
-
  /**
   * Set to true when adding "1=1" predicate (due to null or empty sourceValues).
   */
  private final boolean empty;
-
+  private final boolean not;
  private final Collection<?> sourceValues;
-
  private List<Object> bindValues;
-
  private boolean multiValueSupported;

  InExpression(String propertyName, Collection<?> sourceValues, boolean not) {
@@ -95,7 +91,7 @@ public final class InExpression extends AbstractExpression implements IdInCommon
  public void prepareExpression(BeanQueryRequest<?> request) {
    initBindValues();
    if (bindValues.size() > 0) {
-      multiValueSupported = request.isMultiValueSupported((bindValues.get(0)).getClass());
+      multiValueSupported = request.isMultiValueSupported(bindValues.get(0).getClass());
    }
  }

@@ -117,7 +113,6 @@ public final class InExpression extends AbstractExpression implements IdInCommon
      }
    }
    ElPropertyValue prop = getElProp(request);
-
    List<Object> values = bindValues;
    if (prop != null && prop.isAssocId()) {
      values = new ArrayList<>();
@@ -132,24 +127,23 @@ public final class InExpression extends AbstractExpression implements IdInCommon
    if (values.isEmpty()) {
      // nothing in in-query
      return;
-    } else if (prop.isDbEncrypted()) {
-      // bind the key as well as the value
-      String encryptKey = prop.beanProperty().encryptKey().getStringValue();
-      request.addBindEncryptKey(encryptKey);
-    } else if (prop.isLocalEncrypted()) {
-      List<Object> encValues = new ArrayList<>(values.size());
-      for (Object value : values) {
-        encValues.add(prop.localEncrypt(value));
-      }
-      // this is most likely binary garbage, so don't add it to the bind log
-      request.addBindEncryptKey(new MultiValueWrapper(encValues));
-      return;
    }
-
-    // if we have no property, we wrap them in a multi value wrapper.
-    // later the binder will decide, which bind strategy to use.
+    if (prop != null) {
+      if (prop.isDbEncrypted()) {
+        // bind the key as well as the value
+        request.addBindEncryptKey(prop.beanProperty().encryptKey().getStringValue());
+      } else if (prop.isLocalEncrypted()) {
+        List<Object> encValues = new ArrayList<>(values.size());
+        for (Object value : values) {
+          encValues.add(prop.localEncrypt(value));
+        }
+        // this is most likely binary garbage, so don't add it to the bind log
+        request.addBindEncryptKey(new MultiValueWrapper(encValues));
+        return;
+      }
+    }
+    // wrap in a multi value wrapper, later the binder will decide the bind strategy to use
    request.addBindValue(new MultiValueWrapper(values));
-
  }

  @Override
@@ -164,7 +158,6 @@ public final class InExpression extends AbstractExpression implements IdInCommon
    }

    ElPropertyValue prop = getElProp(request);
-
    if (prop != null) {
      if (prop.isAssocId()) {
        request.append(prop.assocIdInExpr(propName));
@@ -172,15 +165,13 @@ public final class InExpression extends AbstractExpression implements IdInCommon
        return;
      }
      if (prop.isDbEncrypted()) {
-        String dsql = prop.beanProperty().decryptProperty(propName);
-        request.append(dsql);
+        request.append(prop.beanProperty().decryptProperty(propName));
        request.appendInExpression(not, bindValues);
        return;
      }
    }
    request.append(propName);
    request.appendInExpression(not, bindValues);
-
  }

  /**
@@ -1068,4 +1068,9 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
    }
    return null;
  }
+
+  @Override
+  public ExpressionList<T> clear() {
+    return exprList.clear();
+  }
 }
@@ -205,7 +205,8 @@ final class DLoadManyContext extends DLoadBaseContext implements LoadManyContext
          EntityBean ownerBean = bc.getOwnerBean();
          BeanDescriptor<?> parentDesc = context.desc.descriptor(ownerBean.getClass());
          Object parentId = parentDesc.getId(ownerBean);
-          if (parentDesc.cacheManyPropLoad(context.property, bc, parentId, context.parent.isReadOnly())) {
+          final String parentKey = parentDesc.cacheKey(parentId);
+          if (parentDesc.cacheManyPropLoad(context.property, bc, parentKey, context.parent.isReadOnly())) {
            // we loaded the bean collection from cache so remove it from the buffer
            for (int i = 0; i < list.size(); i++) {
              // find it using instance equality - avoiding equals() and potential deadlock issue
@@ -861,7 +861,7 @@ public final class DefaultPersister implements Persister {
    SpiTransaction t = request.transaction();
    EntityBean orphanForRemoval = request.importedOrphanForRemoval();
    if (orphanForRemoval != null) {
-      delete(orphanForRemoval, request.transaction(), true);
+      delete(orphanForRemoval, request.transaction(), false);
    }

    // exported ones with cascade save
@@ -1079,7 +1079,7 @@ public final class DefaultPersister implements Persister {
  private void deleteOrphan(PersistRequestBean<?> request, BeanPropertyAssocOne<?> prop) {
    Object origValue = request.getOrigValue(prop);
    if (origValue instanceof EntityBean) {
-      delete((EntityBean) origValue, request.transaction(), true);
+      delete((EntityBean) origValue, request.transaction(), false);
    }
  }

@@ -35,8 +35,9 @@ final class SaveManyBeans extends SaveManyBase {
  private final boolean untouchedBeanCollection;
  private final Collection<?> collection;
  private final boolean hasOrderColumn;
+  private final boolean forcedUpdate;
  private int sortOrder;
-  private boolean insertAllChildren;
+  private boolean forceOrphanRemoval;

  SaveManyBeans(DefaultPersister persister, boolean insertedParent, BeanPropertyAssocMany<?> many, EntityBean parentBean, PersistRequestBean<?> request) {
    super(persister, insertedParent, many, parentBean, request);
@@ -49,6 +50,7 @@ final class SaveManyBeans extends SaveManyBase {
    this.untouchedBeanCollection = untouchedBeanCollection();
    this.collection = cascade ? BeanCollectionUtil.getActualEntries(value) : null;
    this.hasOrderColumn = many.hasOrderColumn();
+    this.forcedUpdate = request.isForcedUpdate();
  }

  /**
@@ -127,10 +129,8 @@ final class SaveManyBeans extends SaveManyBase {
      targetDescriptor.preAllocateIds(collection.size());
    }
    if (forcedUpdateOrphanRemoval()) {
-      // collect the Id's (to exclude from deleteManyDetails)
-      List<Object> detailIds = collectIds(collection, targetDescriptor, isMap);
-      // deleting missing children - children not in our collected detailIds
-      persister.deleteManyDetails(transaction, many.descriptor(), parentBean, many, detailIds, deleteMode);
+      // deleting orphans, anything not in our detailsIds
+      persister.deleteManyDetails(transaction, many.descriptor(), parentBean, many, detailIds(), deleteMode);
    }
    transaction.depth(+1);
    saveAllBeans(orderColumn);
@@ -141,7 +141,7 @@ final class SaveManyBeans extends SaveManyBase {
  }

  private boolean forcedUpdateOrphanRemoval() {
-    return !insertedParent && many.isOrphanRemoval() && request.isForcedUpdate();
+    return !insertedParent && many.isOrphanRemoval() && (forceOrphanRemoval || forcedUpdate);
  }

  private void saveAllBeans(final BeanProperty orderColumn) {
@@ -177,10 +177,6 @@ final class SaveManyBeans extends SaveManyBase {
            skipSavingThisBean = false;
            // set the parent bean to detailBean
            many.setJoinValuesToChild(parentBean, detail, mapKeyValue);
-          } else if (insertAllChildren) {
-            ebi.setNew();
-            skipSavingThisBean = false;
-            many.setJoinValuesToChild(parentBean, detail, mapKeyValue);
          } else {
            skipSavingThisBean = saveRecurseSkippable;
          }
@@ -215,12 +211,10 @@ final class SaveManyBeans extends SaveManyBase {
  }

  /**
-   * Collect the Id values of the details to remove 'missing children' for stateless updates.
+   * Return the Id values of beans we know are being updated (any others are orphans)
   */
-  private List<Object> collectIds(Collection<?> collection, BeanDescriptor<?> targetDescriptor, boolean isMap) {
-    List<Object> detailIds = new ArrayList<>();
-    // stateless update with deleteMissingChildren so first
-    // collect the Id values to remove the 'missing children'
+  private List<Object> detailIds() {
+    final var detailIds = new ArrayList<>();
    for (Object detailBean : collection) {
      if (isMap) {
        detailBean = ((Map.Entry<?, ?>) detailBean).getValue();
@@ -228,8 +222,10 @@ final class SaveManyBeans extends SaveManyBase {
      if (detailBean instanceof EntityBean) {
        Object id = targetDescriptor.id(detailBean);
        if (!isNullOrZero(id)) {
-          // remember the Id (other details not in the collection) will be removed
-          detailIds.add(id);
+          if (forcedUpdate || !((EntityBean) detailBean)._ebean_getIntercept().isNew()) {
+            // Id of bean that will be updated, exclude it from orphan removal
+            detailIds.add(id);
+          }
        }
      }
    }
@@ -261,8 +257,7 @@ final class SaveManyBeans extends SaveManyBase {
  }

  private void saveAssocManyIntersection(boolean queue) {
-    boolean forcedUpdate = request.isForcedUpdate();
-    boolean vanillaCollection = !(value instanceof BeanCollection<?>);
+    final boolean vanillaCollection = !(value instanceof BeanCollection<?>);
    if (vanillaCollection || forcedUpdate) {
      // delete all intersection rows and then treat all
      // beans in the collection as additions
@@ -321,7 +316,7 @@ final class SaveManyBeans extends SaveManyBase {
          CoreLog.log.log(System.Logger.Level.WARNING, m);
        } else {
          if (!many.hasImportedId(otherBean)) {
-            throw new PersistenceException("ManyToMany bean " + otherBean + " does not have an Id value.");
+            throw new PersistenceException("ManyToMany bean does not have an Id value? " + otherBean);
          } else {
            // build a intersection row for 'insert'
            IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherBean, publish);
@@ -344,10 +339,7 @@ final class SaveManyBeans extends SaveManyBase {
      return;
    }
    if (!(value instanceof BeanCollection<?>)) {
-      if (!forcedUpdateOrphanRemoval() && (!insertedParent && cascade && isChangedProperty())) {
-        persister.addToFlushQueue(many.deleteByParentId(request.beanId(), null), transaction, 0);
-        insertAllChildren = true;
-      }
+      forceOrphanRemoval = !insertedParent && isChangedProperty();
    } else {
      BeanCollection<?> c = (BeanCollection<?>) value;
      Set<?> modifyRemovals = c.getModifyRemovals();
@@ -359,7 +351,9 @@ final class SaveManyBeans extends SaveManyBase {
      if (!hasOrderColumn) {
        c.modifyReset();
      }
-      if (modifyRemovals != null && !modifyRemovals.isEmpty()) {
+      if (modifyRemovals == null || modifyRemovals.isEmpty()) {
+        forceOrphanRemoval = !insertedParent && isChangedProperty();
+      } else {
        for (Object removedBean : modifyRemovals) {
          if (removedBean instanceof EntityBean) {
            EntityBean eb = (EntityBean) removedBean;
@@ -7,25 +7,7 @@ import io.ebeaninternal.server.bind.DataBind;
 import java.sql.SQLException;
 import java.util.Collection;

-import static java.sql.Types.BIGINT;
-import static java.sql.Types.BIT;
-import static java.sql.Types.BOOLEAN;
-import static java.sql.Types.CHAR;
-import static java.sql.Types.DATE;
-import static java.sql.Types.DECIMAL;
-import static java.sql.Types.DOUBLE;
-import static java.sql.Types.FLOAT;
-import static java.sql.Types.INTEGER;
-import static java.sql.Types.NCHAR;
-import static java.sql.Types.NUMERIC;
-import static java.sql.Types.NVARCHAR;
-import static java.sql.Types.REAL;
-import static java.sql.Types.SMALLINT;
-import static java.sql.Types.TIMESTAMP;
-import static java.sql.Types.TIMESTAMP_WITH_TIMEZONE;
-import static java.sql.Types.TIME_WITH_TIMEZONE;
-import static java.sql.Types.TINYINT;
-import static java.sql.Types.VARCHAR;
+import static java.sql.Types.*;

 /**
 * Base MultiValueBind for platform specific support.
@@ -86,6 +68,8 @@ abstract class AbstractMultiValueBind extends MultiValueBind {
      case ExtraDbTypes.UUID: // Postgres cast to uuid[]
      case ExtraDbTypes.INET: // Postgres cast to inet[]
        return "varchar";
+      case VARBINARY:
+        return "bytea";

      default:
        return null;
@@ -17,7 +17,7 @@ public class MultiValueBind {
  }

  Object[] toArray(Collection<?> values, ScalarType<?> type) {
-    Object[] array = new Object[values.size()];
+    Object[] array = type.binary() ? new byte[values.size()][] : new Object[values.size()];
    int i = 0;
    for (Object value : values) {
      array[i++] = type.toJdbcType(value);
@@ -396,7 +396,7 @@ final class CQueryBuilder {
      sql = nativeQueryPaging(query, sql);
    }
    query.setGeneratedSql(sql);
-    Connection connection = request.transaction().connection();
+    Connection connection = request.transaction().getInternalConnection();
    BeanDescriptor<?> desc = request.descriptor();
    try {
      // For SqlServer we need either "selectMethod=cursor" in the connection string or fetch explicitly a cursorable
@@ -585,16 +585,11 @@ final class CQueryBuilder {
        }
        if (distinct && dbOrderBy != null) {
          // add the orderBy columns to the select clause (due to distinct)
-          final OrderBy<?> orderBy = query.getOrderBy();
-          if (orderBy != null && orderBy.supportsSelect()) {
-            String trimmed = DbOrderByTrim.trim(dbOrderBy);
-            if (query.isSingleAttribute() && select.selectSql().startsWith(trimmed)) {
-              // NOP, already in SQL
-              // TODO: what to do if we select("id").orderBy("prop,id")?
-              // Can we live with a query like "select t0.id, t0.prop, t0.id from"
-              // or should we elliminate the second "t0.id" from select
-            } else {
-              sb.append(", ").append(trimmed);
+          String[] tokens = DbOrderByTrim.trim(dbOrderBy).split(",");
+          for (String token : tokens) {
+            token = token.trim();
+            if (!DbOrderByTrim.contains(select.selectSql(), token)) {
+              sb.append(", ").append(token);
            }
          }
        }
@@ -643,7 +638,7 @@ final class CQueryBuilder {
    private void appendHistoryAsOfPredicate() {
      if (query.isAsOfBaseTable()) {
        query.incrementAsOfTableCount();
-        if (!historySupport.isStandardsBased()){
+        if (!historySupport.isStandardsBased()) {
          appendAndOrWhere();
          sb.append(historySupport.asOfPredicate(request.baseTableAlias()));
        }
@@ -4,7 +4,7 @@ import java.util.regex.Pattern;

 final class DbOrderByTrim {

-  private static final Pattern orderByTrim = Pattern.compile("(?i) asc\\b| desc\\b|\\b nulls first\\b|\\b nulls last\\b");
+  private static final Pattern orderByTrim = Pattern.compile("(?i) asc\\b| desc\\b| nulls first\\b| nulls last\\b");

  /**
   * Convert the dbOrderBy clause to be safe for adding to select or distinct on.
@@ -14,4 +14,21 @@ final class DbOrderByTrim {
    return orderByTrim.matcher(dbOrderBy).replaceAll("");
  }

+  /**
+   * Checks, if <code>sql</code> contains the <code>column</code>.
+   * <p>
+   * SQL is normally comma separated: "t0.id, t1.id, t2.name"
+   */
+  static boolean contains(String sql, String column) {
+    if (sql.endsWith(column)) { // simplest way. sql ends with the column
+      return true;
+    } else if (sql.contains(column)) {
+      // We need to check, if it is really the correct column,
+      // sql="t0.name_short, t0.name_long" will match on column="t0.name"
+      return sql.contains(column + ",");
+    } else {
+      return false;
+    }
+  }
+
 }
@@ -172,7 +172,7 @@ public final class SqlTreeBuilder {
    String[] split = idCols.split(",");
    for (String col : split) {
      col = col.trim();
-      if (!dbOrderBy.contains(col)) {
+      if (!DbOrderByTrim.contains(dbOrderBy, col)) {
        sb.append(", ").append(col);
      }
    }
@@ -5,6 +5,7 @@ import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
 import io.ebean.core.type.ScalarDataReader;
+import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.server.deploy.DbReadContext;
@@ -14,6 +15,8 @@ import io.ebeaninternal.server.deploy.id.IdBinder;
 import java.sql.SQLException;
 import java.util.Map;

+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
 * Normal bean included in the query.
 */
@@ -211,6 +214,9 @@ class SqlTreeLoadBean implements SqlTreeLoad {
        contextBean = ((STreePropertyAssocOne)nodeBeanProp).valueAsEntityBean(parentBean);
        if (contextBean != null) {
          desc.markAsDeleted(contextBean);
+          if (CoreLog.markedAsDeleted.isLoggable(DEBUG)) {
+            CoreLog.markedAsDeleted.log(DEBUG, contextBean + " contextBean markedAsDeleted", new RuntimeException(contextBean + " contextBean markedAsDeleted"));
+          }
        }
      }
    }
@@ -129,6 +129,26 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
    return Optional.ofNullable(findOne());
  }

+  @Override
+  public DtoQuery<T> setNullParameter(String name, int jdbcType) {
+    if (ormQuery != null) {
+      ormQuery.initBindParams().setNullParameter(name, jdbcType);
+    } else {
+      bindParams.setNullParameter(name, jdbcType);
+    }
+    return this;
+  }
+
+  @Override
+  public DtoQuery<T> setNullParameter(int position, int jdbcType) {
+    if (ormQuery != null) {
+      ormQuery.initBindParams().setNullParameter(position, jdbcType);
+    } else {
+      bindParams.setNullParameter(position, jdbcType);
+    }
+    return this;
+  }
+
  @Override
  public DtoQuery<T> setParameter(int position, Object value) {
    if (ormQuery != null) {
@@ -1544,19 +1544,13 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {

  @Override
  public final Query<T> setParameter(Object value) {
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setNextParameter(value);
+    initBindParams().setNextParameter(value);
    return this;
  }

  @Override
  public final Query<T> setParameters(Object... values) {
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setNextParameters(values);
+    initBindParams().setNextParameters(values);
    return this;
  }

@@ -1567,10 +1561,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   */
  @Override
  public final Query<T> setParameter(int position, Object value) {
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setParameter(position, value);
+    initBindParams().setParameter(position, value);
    return this;
  }

@@ -1586,10 +1577,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
        return this;
      }
    }
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setParameter(name, value);
+    initBindParams().setParameter(name, value);
    return this;
  }

@@ -1598,10 +1586,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    if (namedParams != null) {
      throw new IllegalStateException("setArrayParameter() not supported when EQL parsed query");
    }
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setArrayParameter(name, values);
+    initBindParams().setArrayParameter(name, values);
  }

  @Override
@@ -1789,6 +1774,14 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    return bindParams;
  }

+  @Override
+  public BindParams initBindParams() {
+    if (bindParams == null) {
+      bindParams = new BindParams();
+    }
+    return bindParams;
+  }
+
  @Override
  public final Query<T> where(Expression expression) {
    where().add(expression);
@@ -35,7 +35,7 @@ abstract class TransactionFactory {
   */
  final SpiTransaction setIsolationLevel(SpiTransaction t, boolean explicit, int isolationLevel) {
    if (isolationLevel > -1) {
-      Connection connection = t.connection();
+      Connection connection = t.getInternalConnection();
      try {
        connection.setTransactionIsolation(isolationLevel);
      } catch (SQLException e) {
@@ -111,7 +111,10 @@ public final class DefaultTypeManager implements TypeManager {
  }

  private void loadGeoTypeBinder(DatabaseConfig config) {
-    final GeoTypeProvider provider = ServiceUtil.service(GeoTypeProvider.class);
+    GeoTypeProvider provider = config.getServiceObject(GeoTypeProvider.class);
+    if (provider == null) {
+      provider = ServiceUtil.service(GeoTypeProvider.class);
+    }
    if (provider != null) {
      geoTypeBinder = provider.createBinder(config);
    }
@@ -1 +0,0 @@
-ebean-version: 141
@@ -99,6 +99,14 @@ public class DefaultExpressionListTest extends BaseExpressionTest {
      .isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isFalse();
  }

+  @Test
+  public void isSameWithClear() {
+    DefaultExpressionList<?> exp1 = spi(exp().eq("a", 10).eq("b", 20).clear().eq("c", 30));
+    DefaultExpressionList<?> exp2 = spi(exp().eq("c", 30));
+    same(exp1, exp2);
+    assertThat(exp1.isSameByBind(exp2)).isTrue();
+  }
+  
  @SuppressWarnings("unchecked")
  @Test
  void copy() {
@@ -64,4 +64,11 @@ public class DbOrderByTrimTest {
    assertEquals("foo", DbOrderByTrim.trim("foo desc nulls last"));
  }

+  @Test
+  void trim_nulls_withAggFunction() {
+    assertEquals("min(customer)", DbOrderByTrim.trim("min(customer) asc nulls last"));
+    assertEquals("foo,min(customer)", DbOrderByTrim.trim("foo,min(customer) asc nulls last"));
+    assertEquals("bar,min(customer)", DbOrderByTrim.trim("bar desc,min(customer) asc nulls last"));
+  }
+
 }
@@ -65,8 +65,8 @@ class BasePlatformArrayTypeFactoryTest {
    }

    @Override
-    public void setString(String s) {
-      setEmptyString = "[]".equals(s);
+    public void setString(String value) {
+      setEmptyString = "[]".equals(value);
    }

    @Override
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

@@ -58,7 +58,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

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

+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
 import io.ebeaninternal.dbmigration.migration.*;

 import java.util.ArrayList;
@@ -125,6 +126,21 @@ public class ModelDiff {
    // search for tables that are no longer used
    for (MTable existingTable : baseModel.getTables().values()) {
      if (!newTables.containsKey(existingTable.getName())) {
+        // Compounded foreign keys used in many-to-many mapping tables
+        existingTable.getCompoundKeys().forEach(it -> addAlterForeignKey(it.dropForeignKey(existingTable.getName())));
+        // Foreign keys through direct mapping (oneToMany)
+        existingTable.allColumns().stream()
+          .filter(it -> it.getForeignKeyIndex() != null)
+          .map(it -> {
+            AlterForeignKey fk = new AlterForeignKey();
+            fk.setName(it.getForeignKeyName());
+            fk.setIndexName(it.getForeignKeyIndex());
+            fk.setColumnNames(DdlHelp.DROP_FOREIGN_KEY);
+            fk.setTableName(existingTable.getName());
+            return fk;
+          })
+          .forEach(applyChanges::add);
+
        addDropTable(existingTable);
      }
    }
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean external mapping api</name>
@@ -4,12 +4,12 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.12.0</tag>
  </scm>

  <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -54,21 +54,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

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

@@ -1 +1 @@
-ebean-version: 141
+ebean-version: 142
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <artifactId>ebean-jackson-jsonnode</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

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

@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

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

@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

@@ -6,7 +6,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1-SNAPSHOT</version>
+    <version>13.12.0-SNAPSHOT</version>
  </parent>

  <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1-SNAPSHOT</version>
+      <version>13.12.0-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>

@@ -50,7 +50,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.10.1-SNAPSHOT</version>
+      <version>13.12.0-SNAPSHOT</version>
      <scope>test</scope>
    </dependency>

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

  <name>ebean postgis</name>
@@ -22,14 +22,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

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

@@ -50,7 +50,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.5.0</version>
+      <version>42.5.1</version>
      <scope>provided</scope>
    </dependency>

@@ -65,7 +65,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

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

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

@@ -63,21 +63,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

@@ -3,6 +3,8 @@ package org.example.domain;
 import io.ebean.annotation.DbArray;

 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,7 +18,11 @@ import java.util.Map;
 public class Contact extends BaseModel {

  @DbArray
-  List<String> phoneNumbers = new ArrayList<>();
+  List<@Size(max=20) String> phoneNumbers = new ArrayList<>();
+
+  @ElementCollection
+  @Size(max=10)
+  List<@Size(max=20) String> paths;

  @Column(length = 50)
  String firstName;
@@ -36,7 +42,7 @@ public class Contact extends BaseModel {
  Customer customer;

  @OneToMany(mappedBy = "contact")
-  List<ContactNote> notes;
+  List<@NotNull ContactNote> notes;

  @OneToMany(cascade = CascadeType.PERSIST)
  @MapKey(name = "key")
@@ -857,10 +857,20 @@ public class QCustomerTest {
    cust.setName("testFetchByScalarValue");
    cust.setPhoneNumber(new PhoneNumber("+18005555555"));
    cust.save();
-    assertThat(new QCustomer()
+
+    var customer = new QCustomer()
      .name.eq("testFetchByScalarValue")
      .phoneNumber.eq(new PhoneNumber("+18005555555"))
-      .findOne()).isNotNull();
+      .findOne();
+
+    assertThat(customer).isNotNull();
+
+    var customers = new QCustomer()
+      .name.eq("testFetchByScalarValue")
+      .phoneNumber.eq(new PhoneNumber("+18005555555"))
+      .findList();
+
+    assertThat(customers).hasSize(1);
  }


@@ -6,8 +6,8 @@ datasource.default=h2

 datasource.h2.username=sa
 datasource.h2.password=
-datasource.h2.url=jdbc:h2:mem:tests;NON_KEYWORDS=KEY
+datasource.h2.url=jdbc:h2:mem:tests;NON_KEYWORDS=KEY,VALUE

 datasource.pg.username=sa
 datasource.pg.password=
-datasource.pg.url=jdbc:h2:mem:tests;NON_KEYWORDS=KEY
+datasource.pg.url=jdbc:h2:mem:tests;NON_KEYWORDS=KEY,VALUE
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

@@ -0,0 +1,39 @@
+package org.domain;
+
+import io.ebean.Model;
+import io.ebean.annotation.Cache;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+@Cache
+@Entity
+public class UChild extends Model {
+
+  @Id
+  long id;
+
+  String name;
+
+  @ManyToOne
+  final UParent parent;
+
+  public UChild(UParent parent, String name) {
+    this.parent = parent;
+    this.name = name;
+  }
+
+  public long id() {
+    return id;
+  }
+
+  public String name() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+}
@@ -0,0 +1,51 @@
+package org.domain;
+
+import io.ebean.Model;
+import io.ebean.annotation.Cache;
+import io.ebean.annotation.CacheBeanTuning;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@Cache(enableQueryCache = true)
+@CacheBeanTuning(maxSecsToLive = 1)
+@Entity
+public class UParent extends Model {
+
+  @Id
+  private UUID id;
+
+  private String name;
+
+  @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL)
+  private final List<UChild> children = new ArrayList<>();
+
+  public UParent(String name) {
+    this.name = name;
+  }
+
+  public UUID id() {
+    return id;
+  }
+
+  public void setId(UUID id) {
+    this.id = id;
+  }
+
+  public String name() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<UChild> children() {
+    return children;
+  }
+}
@@ -5,6 +5,8 @@ import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheStatistics;
 import org.domain.Person;
 import org.domain.RCust;
+import org.domain.UChild;
+import org.domain.UParent;
 import org.domain.query.QPerson;
 import org.domain.query.QRCust;
 import org.junit.jupiter.api.Test;
@@ -19,6 +21,32 @@ import static org.assertj.core.api.Assertions.assertThat;

 class IntegrationTest {

+  @Test
+  void uuid_getPut() {
+    UParent b0 = new UParent("b0");
+    b0.children().add(new UChild(b0,"b0c0"));
+    b0.children().add(new UChild(b0,"b0c1"));
+    b0.save();
+
+    ServerCache beanCache = DB.cacheManager().beanCache(UParent.class);
+    beanCache.clear();
+    beanCache.statistics(true);
+
+    UParent found0 = DB.find(UParent.class, b0.id());
+    assertThat(found0.name()).isEqualTo("b0");
+
+    List<UChild> children = found0.children();
+    assertThat(children).hasSize(2);
+
+    UParent found1 = DB.find(UParent.class, b0.id());
+    assertThat(found1.name()).isEqualTo("b0");
+
+    DB.delete(found1);
+
+    ServerCacheStatistics stats1 = beanCache.statistics(true);
+    assertThat(stats1.getHitCount()).isEqualTo(1);
+  }
+
  @Test
  void mget_when_emptyCollectionOfIds() {

@@ -2,6 +2,7 @@ ebean:
  dumpMetricsOnShutdown: true
  dumpMetricsOptions: sql,hash,loc
  test:
+    registerTestTenantProvider: false
    redis: latest
 #    shutdown: stop # stop | remove
    platform: h2 # h2, postgres, mysql, oracle, sqlserver, sqlite
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.12.0</version>
  </parent>

  <name>ebean test</name>
@@ -28,20 +28,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
    </dependency>

    <dependency>
@@ -105,28 +105,28 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.10.1</version>
+      <version>13.12.0</version>
      <scope>test</scope>
    </dependency>

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

@@ -183,7 +183,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.5.0</version>
+      <version>42.5.1</version>
      <exclusions>
        <exclusion>
          <groupId>org.checkerframework</groupId>
@@ -25,7 +25,7 @@ class YugabyteSetup implements PlatformSetup {
    if (!config.isUseDocker()) {
      return new Properties();
    }
-    config.setDockerVersion("2.11.2.0-b89");
+    config.setDockerVersion("2.16.0.1-b7");
    config.setExtensions("pgcrypto");
    return config.getDockerProperties();
  }
@@ -38,8 +38,10 @@ public class ProviderAutoConfig {

    CurrentTenantProvider tenantProvider = config.getCurrentTenantProvider();
    if (tenantProvider == null) {
-      providerSetFlag += 2;
-      config.setCurrentTenantProvider(new WhoTenantProvider());
+      if (Boolean.parseBoolean(properties.getProperty("ebean.test.registerTestTenantProvider", "true"))) {
+        providerSetFlag += 2;
+        config.setCurrentTenantProvider(new WhoTenantProvider());
+      }
    }

    EncryptKeyManager keyManager = config.getEncryptKeyManager();
@@ -236,7 +236,95 @@ public class DtoQuery2Test extends BaseTestCase {
    assertThat(stats).hasSize(2);

    log.info("stats " + stats);
+  }

+  @Test
+  void dto_mapping_columnsWithUnderscores() {
+    ResetBasicData.reset();
+
+    List<DCustCamelCols0> list = server().findDto(DCustCamelCols0.class,
+        "select id as num_with, name as name_for_me from o_customer")
+      .findList();
+
+    assertThat(list).isNotEmpty();
+    for (DCustCamelCols0 dto : list) {
+      assertThat(dto.getNumWith()).isGreaterThan(0);
+      assertThat(dto.getNameForMe()).isNotNull();
+    }
+  }
+
+  @Test
+  void dto_mapping_columnsWithNoUnderscores() {
+    ResetBasicData.reset();
+
+    List<DCustCamelCols0> list = server().findDto(DCustCamelCols0.class,
+        "select id as numwith, name as nameforme from o_customer")
+      .findList();
+
+    assertThat(list).isNotEmpty();
+    for (DCustCamelCols0 dto : list) {
+      assertThat(dto.getNumWith()).isGreaterThan(0);
+      assertThat(dto.getNameForMe()).isNotNull();
+    }
+
+    // mapping is case-insensitive
+    List<DCustCamelCols0> list2 = server().findDto(DCustCamelCols0.class,
+        "select id as numWith, name as nameForMe from o_customer")
+      .findList();
+
+    assertThat(list2).isNotEmpty();
+    for (DCustCamelCols0 dto : list2) {
+      assertThat(dto.getNumWith()).isGreaterThan(0);
+      assertThat(dto.getNameForMe()).isNotNull();
+    }
+  }
+
+  @Test
+  void dto_mapping_propertyNamesCaseInsensitive() {
+    ResetBasicData.reset();
+
+    List<DCustCamelCols2> list = server().findDto(DCustCamelCols2.class,
+        "select id as numwith, name as nameforme from o_customer")
+      .findList();
+
+    assertThat(list).isNotEmpty();
+    for (DCustCamelCols2 dto : list) {
+      assertThat(dto.getNumWITH()).isGreaterThan(0);
+      assertThat(dto.getNameFORMe()).isNotNull();
+    }
+
+    // mapping is case-insensitive
+    List<DCustCamelCols2> list2 = server().findDto(DCustCamelCols2.class,
+        "select id as numWith, name as nameForMe from o_customer")
+      .findList();
+
+    assertThat(list2).isNotEmpty();
+    for (DCustCamelCols2 dto : list2) {
+      assertThat(dto.getNumWITH()).isGreaterThan(0);
+      assertThat(dto.getNameFORMe()).isNotNull();
+    }
+  }
+
+  @Test
+  void dto_mapping_columnsUsingNestedSql() {
+    ResetBasicData.reset();
+
+    String sql
+      = "select num_with, name_for_me from ( "
+      // we don't CARE what the nested SQL is in that the jdbc metaData
+      // for the column names/labels comes from the top most select
+      + "    select id as num_with, name as name_for_me from o_customer "
+      + ") a";
+
+    List<DCustCamelCols0> list = server().findDto(DCustCamelCols0.class,
+        sql)
+      .findList();
+
+    assertThat(list).isNotEmpty();
+    for (DCustCamelCols0 dto : list) {
+      assertThat(dto.getNumWith()).isGreaterThan(0);
+      assertThat(dto.getNameForMe()).isNotNull();
+    }
  }

  @Test
@@ -478,4 +566,52 @@ public class DtoQuery2Test extends BaseTestCase {
      this.name = name;
    }
  }
+
+  public static class DCustCamelCols0 {
+
+    Integer numWith;
+    String nameForMe;
+
+    public Integer getNumWith() {
+      return numWith;
+    }
+
+    public DCustCamelCols0 setNumWith(Integer numWith) {
+      this.numWith = numWith;
+      return this;
+    }
+
+    public String getNameForMe() {
+      return nameForMe;
+    }
+
+    public DCustCamelCols0 setNameForMe(String nameForMe) {
+      this.nameForMe = nameForMe;
+      return this;
+    }
+  }
+
+  public static class DCustCamelCols2 {
+
+    Integer numWITH;
+    String nameFORMe;
+
+    public Integer getNumWITH() {
+      return numWITH;
+    }
+
+    public DCustCamelCols2 setNumWITH(Integer numWITH) {
+      this.numWITH = numWITH;
+      return this;
+    }
+
+    public String getNameFORMe() {
+      return nameFORMe;
+    }
+
+    public DCustCamelCols2 setNameFORMe(String nameFORMe) {
+      this.nameFORMe = nameFORMe;
+      return this;
+    }
+  }
 }
@@ -18,6 +18,7 @@ import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasicLog;
 import org.tests.model.basic.ResetBasicData;

+import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -366,6 +367,38 @@ class DtoQueryTest extends BaseTestCase {
    assertThat(list).isNotEmpty();
  }

+  @ForPlatform(Platform.H2)
+  @Test
+  void dto3_setNullByPosition() {
+    ResetBasicData.reset();
+
+    List<DCust3> robs = server().findDto(DCust3.class, "select id, name, nvl(cast(? as int), 42) as totalOrders from o_customer where name like ?")
+      .setNullParameter(1, Types.INTEGER)
+      .setParameter(2, "Rob")
+      .setMaxRows(10)
+      .findList();
+
+    log.info(robs.toString());
+    assertThat(robs).isNotEmpty();
+    assertThat(robs.get(0).getTotalOrders()).isEqualTo(42);
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  void dto3_setNullByName() {
+    ResetBasicData.reset();
+
+    List<DCust3> robs = server().findDto(DCust3.class, "select id, name, nvl(cast(:foo as int), 42) as totalOrders from o_customer where name like :bar")
+      .setNullParameter("foo", Types.INTEGER)
+      .setParameter("bar", "Rob")
+      .setMaxRows(10)
+      .findList();
+
+    log.info(robs.toString());
+    assertThat(robs).isNotEmpty();
+    assertThat(robs.get(0).getTotalOrders()).isEqualTo(42);
+  }
+
  @Test
  void dto3_findList_constructorMatch() {
    ResetBasicData.reset();
@@ -4,13 +4,53 @@ import io.ebean.Database;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.event.ServerConfigStartup;
+import io.ebeaninternal.api.SpiLogger;
+import io.ebeaninternal.api.SpiLoggerFactory;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.UTDetail;

+import java.util.HashSet;
+import java.util.Set;
+
 import static org.assertj.core.api.Assertions.assertThat;

 public class EbeanServerFactory_ServerConfigStart_Test {

+
+  /**
+   * Demo, how to intercept logging for a certain database.
+   * In conjunction to ServiceLoader, you can add different loggers to different databases
+   */
+  private static class MySpiLoggerFactory implements SpiLoggerFactory {
+    Set<String> loggers = new HashSet<>();
+
+    @Override
+    public SpiLogger create(String name) {
+      loggers.add(name);
+      // just return a dummy here
+      return new SpiLogger() {
+        @Override
+        public boolean isDebug() {
+          return false;
+        }
+
+        @Override
+        public boolean isTrace() {
+          return false;
+        }
+
+        @Override
+        public void debug(String msg) {
+        }
+
+        @Override
+        public void trace(String msg) {
+        }
+      };
+
+    }
+  }
+
  @Test
  public void test() throws InterruptedException {

@@ -30,9 +70,13 @@ public class EbeanServerFactory_ServerConfigStart_Test {
    // act - register an instance
    OnStartup onStartup = new OnStartup();
    config.addServerConfigStartup(onStartup);
+    MySpiLoggerFactory loggerFactory = new MySpiLoggerFactory();
+    config.putServiceObject(SpiLoggerFactory.class, loggerFactory);

    Database db = DatabaseFactory.create(config);

+    assertThat(loggerFactory.loggers).containsExactlyInAnyOrder("io.ebean.SQL", "io.ebean.SUM", "io.ebean.TXN");
+
    assertThat(onStartup.calledWithConfig).isSameAs(config);
    assertThat(OnStartupViaClass.calledWithConfig).isSameAs(config);

--- a/Show More
+++ b/Show More