[maven-release-plugin] prepare release ebean-12.3.4

#2004 - MariaDb specific platform with @History support (initial)

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>12.1.14-SNAPSHOT</version>
+  <version>12.3.4</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-12.3.4</tag>
   </scm>
 
   <profiles>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>config</artifactId>
-      <version>1.0</version>
+      <version>1.2</version>
     </dependency>
 
     <!--
@@ -72,22 +72,22 @@
     to assist with IDE auto-completion with Ebean API
     -->
     <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-jsr305</artifactId>
-      <version>1.1</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-jsr305</artifactId>
+      <version>1.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>persistence-api</artifactId>
-      <version>2.2.2</version>
+      <version>2.2.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>6.9</version>
+      <version>6.12</version>
     </dependency>
 
     <dependency>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.7.3</version>
+      <version>5.1</version>
     </dependency>
 
     <dependency>
@@ -200,7 +200,7 @@
     <dependency>
       <groupId>io.ebean.test</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>3.1.3</version>
+      <version>3.1.5</version>
       <scope>test</scope>
     </dependency>
 
@@ -248,6 +248,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.mariadb.jdbc</groupId>
+      <artifactId>mariadb-java-client</artifactId>
+      <version>2.6.0</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.sap.cloud.db.jdbc</groupId>
       <artifactId>ngdbc</artifactId>
@@ -292,7 +299,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.1.12</version>
+        <version>12.3.4</version>
         <executions>
           <execution>
             <id>test</id>
@@ -310,7 +317,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.1</version>
+        <version>3.0.0-M4</version>
         <configuration>
           <useSystemClassLoader>false</useSystemClassLoader>
           <trimStackTrace>false</trimStackTrace>

src/main/java/io/ebean/BackgroundExecutor.java

@@ -31,15 +31,18 @@ public interface BackgroundExecutor {
    * Execute a task periodically with a fixed delay between each execution.
    * <p>
    * For example, execute a runnable every minute.
-   * </p>
    * <p>
    * The delay is the time between executions no matter how long the task took.
    * That is, this method has the same behaviour characteristics as
    * {@link ScheduledExecutorService#scheduleWithFixedDelay(Runnable, long, long, TimeUnit)}
-   * </p>
    */
   void executePeriodically(Runnable r, long delay, TimeUnit unit);
 
+  /**
+   * Execute a task periodically additionally with an initial delay different from delay.
+   */
+  void executePeriodically(Runnable r, long initialDelay, long delay, TimeUnit unit);
+
   /**
    * Schedules a Runnable for one-shot action that becomes enabled after the given delay.
    *

src/main/java/io/ebean/DB.java

@@ -101,6 +101,22 @@ public class DB {
 //    return originalPrimaryServer;
 //  }
 
+  /**
+   * Return the ScriptRunner for the default database.
+   * <p>
+   * Useful to run SQL scripts that are resources. For example a test script
+   * for inserting seed data for a particular test.
+   *
+   * <pre>{@code
+   *
+   *   DB.script().run("/scripts/test-script.sql")
+   *
+   * }</pre>
+   */
+  public static ScriptRunner script() {
+    return getDefault().script();
+  }
+
   /**
    * Return the ExpressionFactory from the default database.
    * <p>

src/main/java/io/ebean/Ebean.java

@@ -24,7 +24,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * Ebean will be Deprecated - please migrate to use DB.
+ * Deprecated - please migrate to use <code>io.ebean.DB</code>.
  * <p>
  * Ebean is a registry of {@link Database} by name. Ebean has now been renamed to {@link DB}.
  * <p>
@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * <p>
  * The preference is to use DB and Database rather than Ebean and EbeanServer.
  */
+@Deprecated
 public final class Ebean {
   private static final Logger logger = LoggerFactory.getLogger(Ebean.class);
 

src/main/java/io/ebean/EbeanServer.java

@@ -1,6 +1,7 @@
 package io.ebean;
 
 /**
+ * Deprecated - please migrate to <code>io.ebean.Database</code>.
  * Provides the API for fetching and saving beans to a particular Database.
  * <p>
  * Effectively this is an alias for {@link Database} which is now the new
@@ -8,6 +9,7 @@ package io.ebean;
  * <p>
  * The preference is to use DB and Database rather than Ebean and EbeanServer.
  */
+@Deprecated
 public interface EbeanServer extends Database {
 
 }

src/main/java/io/ebean/EbeanServerFactory.java

@@ -11,6 +11,8 @@ import java.util.Properties;
 import java.util.ServiceLoader;
 
 /**
+ * Deprecated - please migrate to DatabaseFactory.
+ * <p>
  * Creates EbeanServer instances.
  * <p>
  * This uses either a ServerConfig or properties in the ebean.properties file to
@@ -28,6 +30,7 @@ import java.util.ServiceLoader;
  * convenient way of using the 'default/primary' EbeanServer.
  * </p>
  */
+@Deprecated
 public class EbeanServerFactory {
 
 

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

@@ -70,30 +70,40 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> order(String orderByClause);
 
+  /**
+   * Set the order by clause replacing the existing order by clause if there is
+   * one.
+   * <p>
+   * This follows SQL syntax using commas between each property with the
+   * optional asc and desc keywords representing ascending and descending order
+   * respectively.
+   */
+  ExpressionList<T> orderBy(String orderBy);
+
   /**
    * Return the OrderBy so that you can append an ascending or descending
    * property to the order by clause.
    * <p>
    * This will never return a null. If no order by clause exists then an 'empty'
    * OrderBy object is returned.
-   * </p>
+   * <p>
+   * This is the same as <code>orderBy()</code>
    */
   OrderBy<T> order();
 
   /**
-   * Deprecated migrate to order().
+   * Return the OrderBy so that you can append an ascending or descending
+   * property to the order by clause.
+   * <p>
+   * This will never return a null. If no order by clause exists then an 'empty'
+   * OrderBy object is returned.
+   * <p>
+   * This is the same as <code>order()</code>
    */
-  @Deprecated
   OrderBy<T> orderBy();
 
   /**
-   * Deprecated migrate to {@link #order(String)}
-   */
-  @Deprecated
-  Query<T> orderBy(String orderBy);
-
-  /**
-   * Deprecated migrate to {@link #order(String)}
+   * Deprecated migrate to {@link #orderBy(String)}
    */
   @Deprecated
   Query<T> setOrderBy(String orderBy);
@@ -1241,26 +1251,37 @@ public interface ExpressionList<T> {
   /**
    * Add raw expression with a single parameter.
    * <p>
-   * The raw expression should contain a single ? at the location of the
-   * parameter.
+   * The raw expression should contain a single ? or ?1
+   * at the location of the parameter.  We use ?1 when binding a
+   * collection for an IN expression.
    * </p>
-   * <p>
+   * <p>>
    * When properties in the clause are fully qualified as table-column names
    * then they are not translated. logical property name names (not fully
    * qualified) will still be translated to their physical name.
    * </p>
    * <p>
-   * <h4>Example:</h4>
+   * <h4>Examples:</h4>
    * <pre>{@code
    *
    *   // use a database function
    *   raw("add_days(orderDate, 10) < ?", someDate)
    *
+   *   raw("name like ?", "Rob%")
+   *
+   *   raw("name in (?1)", asList("Rob", "Fiona", "Jack"))
+   *
+   *   raw("name = any(?)", asList("Rob", "Fiona", "Jack"))
+   *
    * }</pre>
    *
-   * <h4>Subquery example:</h4>
+   * <h4>Subquery examples:</h4>
    * <pre>{@code
    *
+   *   // Bind collection using ?1
+   *   .raw("id in (select c.id from o_customer c where c.name in (?1))", asList("Rob", "Fiona", "Jack"))
+   *
+   *   // Using Postgres ANY expression
    *   .raw("t0.customer_id in (select customer_id from customer_group where group_id = any(?::uuid[]))", groupIds)
    *
    * }</pre>
@@ -1270,14 +1291,25 @@ public interface ExpressionList<T> {
   /**
    * Add raw expression with an array of parameters.
    * <p>
-   * The raw expression should contain the same number of ? as there are
-   * parameters.
-   * </p>
+   * The raw expression should contain the same number of ? or ?1, ?2 ... bind parameters
+   * as there are values. We use ?1, ?2 etc when binding a collection for an IN expression.
    * <p>
    * When properties in the clause are fully qualified as table-column names
    * then they are not translated. logical property name names (not fully
    * qualified) will still be translated to their physical name.
    * </p>
+   *
+   * <h4>Examples:</h4>
+   * <pre>{@code
+   *
+   *   raw("unitPrice > ? and product.id > ?", 2, 3)
+   *
+   *   raw("(status = ? or (orderDate < ? and shipDate is null) or customer.name like ?)",
+   *         Order.Status.APPROVED,
+   *         new Timestamp(System.currentTimeMillis()),
+   *         "Rob")
+   *
+   * }</pre></pre>
    */
   ExpressionList<T> raw(String raw, Object... values);
 

src/main/java/io/ebean/ExtendedServer.java

@@ -92,11 +92,9 @@ public interface ExtendedServer {
    * {@link #findEachWhile(Query, Predicate, Transaction)} is preferred
    * to findIterate(). The reason is that those methods automatically take care of
    * closing the queryIterator (and the underlying jdbc statement and resultSet).
-   * </p>
    * <p>
    * This is similar to findEach in that not all the result beans need to be held
    * in memory at the same time and as such is good for processing large queries.
-   * </p>
    *
    * @see Query#findIterate()
    * @see Query#findEach(Consumer)
@@ -106,7 +104,10 @@ public interface ExtendedServer {
   <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
 
   /**
-   * Return the query result as a Stream using a single persistence context.
+   * Execute the query returning the result as a Stream.
+   * <p>
+   * Note that this can support very large queries iterating any number of results.
+   * To do so internally it can use multiple persistence contexts.
    * <p>
    * Note that the stream needs to be closed so use with try with resources.
    * </p>
@@ -115,12 +116,17 @@ public interface ExtendedServer {
   <T> Stream<T> findStream(Query<T> query, Transaction transaction);
 
   /**
-   * Return the query result as a Stream (with multiple persistence contexts).
+   * Deprecated - migrate to findStream().
+   * <p>
+   * Execute the query returning the result as a Stream.
+   * <p>
+   * Note that this can support very large queries iterating any number of results.
+   * To do so internally it can use multiple persistence contexts.
    * <p>
    * Note that the stream needs to be closed so use with try with resources.
-   * </p>
    */
   @Nonnull
+  @Deprecated
   <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction);
 
   /**

src/main/java/io/ebean/Query.java

@@ -711,9 +711,9 @@ public interface Query<T> {
   /**
    * Execute the query returning the result as a Stream.
    * <p>
-   * Note that this will hold all resulting beans in memory using a single
-   * persistence context. Use findLargeStream() for queries that expect to
-   * return a large number of results.
+   * Note that this can support very large queries iterating
+   * any number of results. To do so internally it can use
+   * multiple persistence contexts.
    * </p>
    * <pre>{@code
    *
@@ -731,6 +731,8 @@ public interface Query<T> {
   Stream<T> findStream();
 
   /**
+   * Deprecated - migrate to findStream.
+   * <p>
    * Execute the query returning the result as a Stream.
    * <p>
    * Note that this uses multiple persistence contexts such that we can use
@@ -749,6 +751,7 @@ public interface Query<T> {
    * }</pre>
    */
   @Nonnull
+  @Deprecated
   Stream<T> findLargeStream();
 
   /**
@@ -1352,9 +1355,13 @@ public interface Query<T> {
   Query<T> having(Expression addExpressionToHaving);
 
   /**
-   * Deprecated migrate to {@link #order(String)}
+   * Set the order by clause replacing the existing order by clause if there is
+   * one.
+   * <p>
+   * This follows SQL syntax using commas between each property with the
+   * optional asc and desc keywords representing ascending and descending order
+   * respectively.
    */
-  @Deprecated
   Query<T> orderBy(String orderByClause);
 
   /**
@@ -1373,13 +1380,20 @@ public interface Query<T> {
    * <p>
    * This will never return a null. If no order by clause exists then an 'empty'
    * OrderBy object is returned.
+   * <p>
+   * This is the same as <code>orderBy()</code>
    */
   OrderBy<T> order();
 
   /**
-   * Deprecated migrate to order().
+   * Return the OrderBy so that you can append an ascending or descending
+   * property to the order by clause.
+   * <p>
+   * This will never return a null. If no order by clause exists then an 'empty'
+   * OrderBy object is returned.
+   * <p>
+   * This is the same as <code>order()</code>
    */
-  @Deprecated
   OrderBy<T> orderBy();
 
   /**
@@ -1388,9 +1402,8 @@ public interface Query<T> {
   Query<T> setOrder(OrderBy<T> orderBy);
 
   /**
-   * Deprecated migrate to {@link #setOrder(OrderBy)}
+   * Set an OrderBy object to replace any existing OrderBy clause.
    */
-  @Deprecated
   Query<T> setOrderBy(OrderBy<T> orderBy);
 
   /**

src/main/java/io/ebean/SqlQuery.java

@@ -224,12 +224,49 @@ public interface SqlQuery extends Serializable {
    *
    * }</pre>
    *
+   * <p>
+   * When binding a collection of values into a IN expression we should use
+   * indexed parameters like ?1, ?2, ?3 etc rather than just ?.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *   String sql = "select c.id, c.name from customer c where c.name in (?1)";
+   *
+   *   List<SqlRow> rows = DB.sqlQuery(sql)
+   *       .setParameter(asList("Rob", "Fiona", "Jack"))
+   *       .findList();
+   *
+   *
+   *   List<SqlRow> rows = DB.sqlQuery(sql)
+   *       .setParameter(1, asList("Rob", "Fiona", "Jack"))
+   *       .findList();
+   * }</pre>
+   *
    * @param value The value to bind
    */
   SqlQuery setParameter(Object value);
 
   /**
    * Bind the parameter by its index position (1 based like JDBC).
+   * <p>
+   * When binding a collection of values into a IN expression we should use
+   * indexed parameters like ?1, ?2, ?3 etc rather than just ?.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *   String sql = "select c.id, c.name from customer c where c.name in (?1)";
+   *
+   *   List<SqlRow> rows = DB.sqlQuery(sql)
+   *       .setParameter(asList("Rob", "Fiona", "Jack"))
+   *       .findList();
+   *
+   *
+   *   List<SqlRow> rows = DB.sqlQuery(sql)
+   *       .setParameter(1, asList("Rob", "Fiona", "Jack"))
+   *       .findList();
+   * }</pre>
    */
   SqlQuery setParameter(int position, Object value);
 

src/main/java/io/ebean/SqlUpdate.java

@@ -5,18 +5,16 @@ package io.ebean;
  * <p>
  * Provides a simple way to execute raw SQL insert update or delete statements
  * without having to resort to JDBC.
- * </p>
  * <p>
  * Supports the use of positioned or named parameters and can automatically
  * notify Ebean of the table modified so that Ebean can maintain its cache.
- * </p>
  * <p>
  * Note that {@link #setAutoTableMod(boolean)} and
  * Ebean#externalModification(String, boolean, boolean, boolean)} can be to
  * notify Ebean of external changes and enable Ebean to maintain it's "L2"
  * server cache.
- * </p>
  *
+ * <h2>Positioned parameter example</h2>
  * <pre>{@code
  *
  *   // example using 'positioned' parameters
@@ -30,6 +28,7 @@ package io.ebean;
  *
  * }</pre>
  *
+ * <h2>Named parameter example</h2>
  * <pre>{@code
  *
  *   // example using 'named' parameters
@@ -45,8 +44,31 @@ package io.ebean;
  *   String msg = "There were " + rows + " rows updated";
  *
  * }</pre>
+ *
+ * <h2>Index parameter examples (e.g. ?1, ?2, ?3 ...)</h2>
  * <p>
- * <h3>Example: Using setNextParameter()</h3>
+ * We can use index parameters like ?1, ?2, ?3 etc when binding arrays/collections
+ * of values into an IN expression.
+ * </p>
+ * <pre>{@code
+ *
+ *   // Binding a list of 3 values (9991, 9992, 9993) into an IN expression
+ *
+ *   DB.sqlUpdate("delete from o_customer where name = ? and id in (?2)")
+ *     .setParameter(1, "Foo")
+ *     .setParameter(2, asList(9991, 9992, 9993))
+ *     .execute();
+ *
+ *   // note this effectively is the same as
+ *
+ *   DB.sqlUpdate("delete from o_customer where name = ? and id in (?2)")
+ *     .setParameter("Foo")
+ *     .setParameter(asList(9991, 9992, 9993))
+ *     .execute();
+ *
+ * }</pre>
+ *
+ * <h3>Example: Using setParameter()</h3>
  * <pre>{@code
  *
  *  String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)";
@@ -56,19 +78,19 @@ package io.ebean;
  *  try (Transaction txn = DB.beginTransaction()) {
  *    txn.setBatchMode(true);
  *
- *    insert.setNextParameter(10000);
- *    insert.setNextParameter("hello");
- *    insert.setNextParameter("rob");
+ *    insert.setParameter(10000);
+ *    insert.setParameter("hello");
+ *    insert.setParameter("rob");
  *    insert.execute();
  *
- *    insert.setNextParameter(10001);
- *    insert.setNextParameter("goodbye");
- *    insert.setNextParameter("rob");
+ *    insert.setParameter(10001);
+ *    insert.setParameter("goodbye");
+ *    insert.setParameter("rob");
  *    insert.execute();
  *
- *    insert.setNextParameter(10002);
- *    insert.setNextParameter("chow");
- *    insert.setNextParameter("bob");
+ *    insert.setParameter(10002);
+ *    insert.setParameter("chow");
+ *    insert.setParameter("bob");
  *    insert.execute();
  *
  *    txn.commit();
@@ -81,19 +103,19 @@ package io.ebean;
  *
  *   try (Transaction txn = DB.beginTransaction()) {
  *
- *     insert.setNextParameter(10000);
- *     insert.setNextParameter("hello");
- *     insert.setNextParameter("rob");
+ *     insert.setParameter(10000);
+ *     insert.setParameter("hello");
+ *     insert.setParameter("rob");
  *     insert.addBatch();
  *
- *     insert.setNextParameter(10001);
- *     insert.setNextParameter("goodbye");
- *     insert.setNextParameter("rob");
+ *     insert.setParameter(10001);
+ *     insert.setParameter("goodbye");
+ *     insert.setParameter("rob");
  *     insert.addBatch();
  *
- *     insert.setNextParameter(10002);
- *     insert.setNextParameter("chow");
- *     insert.setNextParameter("bob");
+ *     insert.setParameter(10002);
+ *     insert.setParameter("chow");
+ *     insert.setParameter("bob");
  *     insert.addBatch();
  *
  *     int[] rows = insert.executeBatch();

src/main/java/io/ebean/Transaction.java

@@ -313,7 +313,7 @@ public interface Transaction extends AutoCloseable {
    * <h3>getGeneratedKeys</h3>
    * <p>
    * Often with large batch inserts we want to turn off getGeneratedKeys. We do
-   * this via {@link #setBatchGetGeneratedKeys(boolean)}.
+   * this via {@link #setGetGeneratedKeys(boolean)}.
    * Also note that some JDBC drivers do not support getGeneratedKeys in JDBC batch mode.
    * </p>
    * <pre>{@code
@@ -342,7 +342,7 @@ public interface Transaction extends AutoCloseable {
    * </p>
    * <p>
    * We use {@link #flush()} to explicitly flush the batch and we can use
-   * {@link #setBatchFlushOnQuery(boolean)} and {@link #setBatchFlushOnMixed(boolean)}
+   * {@link #setFlushOnQuery(boolean)} and {@link #setFlushOnMixed(boolean)}
    * to control the automatic flushing behaviour.
    * </p>
    * <p>
@@ -432,7 +432,15 @@ public interface Transaction extends AutoCloseable {
    * number of objects and you don't care about getting back the ids.
    * </p>
    */
-  void setBatchGetGeneratedKeys(boolean getGeneratedKeys);
+  void setGetGeneratedKeys(boolean getGeneratedKeys);
+
+  /**
+   * Deprecated renamed to setGetGeneratedKeys().
+   */
+  @Deprecated
+  default void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+    setGetGeneratedKeys(getGeneratedKeys);
+  }
 
   /**
    * By default when mixing UpdateSql (or CallableSql) with Beans the batch is
@@ -449,7 +457,15 @@ public interface Transaction extends AutoCloseable {
    * have a 2 step process (delayed binding).
    * </p>
    */
-  void setBatchFlushOnMixed(boolean batchFlushOnMixed);
+  void setFlushOnMixed(boolean batchFlushOnMixed);
+
+  /**
+   * Deprecated renamed to setFlushOnMixed().
+   */
+  @Deprecated
+  default void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+    setFlushOnMixed(batchFlushOnMixed);
+  }
 
   /**
    * By default executing a query will automatically flush any batched
@@ -459,7 +475,15 @@ public interface Transaction extends AutoCloseable {
    * execute a query and the batch will not be automatically flushed.
    * </p>
    */
-  void setBatchFlushOnQuery(boolean batchFlushOnQuery);
+  void setFlushOnQuery(boolean batchFlushOnQuery);
+
+  /**
+   * Deprecated renamed to setFlushOnQuery().
+   */
+  @Deprecated
+  default void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+    setFlushOnQuery(batchFlushOnQuery);
+  }
 
   /**
    * Return true if the batch (of persisted beans or executed UpdateSql etc)
@@ -468,7 +492,15 @@ public interface Transaction extends AutoCloseable {
    * The default is for this to be true.
    * </p>
    */
-  boolean isBatchFlushOnQuery();
+  boolean isFlushOnQuery();
+
+  /**
+   * Deprecated renamed to isFlushOnQuery().
+   */
+  @Deprecated
+  default boolean isBatchFlushOnQuery() {
+    return isFlushOnQuery();
+  }
 
   /**
    * The batch will be flushing automatically but you can use this to explicitly

src/main/java/io/ebean/bean/EntityBeanIntercept.java

@@ -40,6 +40,8 @@ public final class EntityBeanIntercept implements Serializable {
 
   private String ebeanServerName;
 
+  private boolean deletedFromCollection;
+
   /**
    * The actual entity bean that 'owns' this intercept.
    */
@@ -913,6 +915,7 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   private void preGetterCallback(int propertyIndex) {
+    PreGetterCallback preGetterCallback = this.preGetterCallback;
     if (preGetterCallback != null) {
       preGetterCallback.preGetterTrigger(propertyIndex);
     }
@@ -1137,6 +1140,17 @@ public final class EntityBeanIntercept implements Serializable {
     this.sortOrder = sortOrder;
   }
 
+  /**
+   * Set if the entity was deleted from a BeanCollection.
+   */
+  public void setDeletedFromCollection(final boolean deletedFromCollection) {
+    this.deletedFromCollection = deletedFromCollection;
+  }
+
+  public boolean isOrphanDelete() {
+    return deletedFromCollection && !isNew();
+  }
+
   /**
    * Set the load error that happened on this property.
    */

src/main/java/io/ebean/bean/PersistenceContext.java

@@ -61,6 +61,22 @@ public interface PersistenceContext {
    */
   int size(Class<?> rootType);
 
+  /**
+   * Return a copy of the Persistence context to use for large query iteration.
+   */
+  PersistenceContext forIterate();
+
+  /**
+   * Return a new Persistence context during iteration of large query result.
+   */
+  PersistenceContext forIterateReset();
+
+  /**
+   * Return true if the persistence context has grown and hit the 'reset limit'
+   * during large query iteration.
+   */
+  boolean resetLimit();
+
   /**
    * Wrapper on a bean to also indicate if a bean has been deleted.
    * <p>

src/main/java/io/ebean/common/ModifyHolder.java

@@ -1,5 +1,7 @@
 package io.ebean.common;
 
+import io.ebean.bean.EntityBean;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -54,6 +56,11 @@ class ModifyHolder<E> implements Serializable {
   void modifyAddition(E bean) {
     if (bean != null) {
       touched = true;
+
+      if (bean instanceof EntityBean) {
+        ((EntityBean) bean)._ebean_getIntercept().setDeletedFromCollection(false);
+      }
+
       // If it is to delete then just remove the deletion
       if (!undoDeletion(bean)) {
         // Insert
@@ -70,6 +77,11 @@ class ModifyHolder<E> implements Serializable {
   void modifyRemoval(Object bean) {
     if (bean != null) {
       touched = true;
+
+      if (bean instanceof EntityBean) {
+        ((EntityBean) bean)._ebean_getIntercept().setDeletedFromCollection(true);
+      }
+
       // If it is to be added then just remove the addition
       if (!undoAddition(bean)) {
         modifyDeletions.add((E) bean);

src/main/java/io/ebean/config/AbstractNamingConvention.java

@@ -222,8 +222,8 @@ public abstract class AbstractNamingConvention implements NamingConvention {
    * Return true if this class is part of entity inheritance.
    */
   protected boolean hasInheritance(Class<?> supCls) {
-    return AnnotationUtil.findAnnotationRecursive(supCls, Inheritance.class) != null
-        || AnnotationUtil.findAnnotation(supCls, DiscriminatorValue.class) != null;
+    return AnnotationUtil.typeHas(supCls, Inheritance.class)
+        || AnnotationUtil.has(supCls, DiscriminatorValue.class);
   }
 
 
@@ -255,16 +255,12 @@ public abstract class AbstractNamingConvention implements NamingConvention {
    * Gets the table name from annotation.
    */
   protected TableName getTableNameFromAnnotation(Class<?> beanClass) {
-
-    final Table t = AnnotationUtil.findAnnotationRecursive(beanClass, Table.class);
-
-    // Take the annotation if defined
-    if (t != null && !isEmpty(t.name())) {
+    final Table table = AnnotationUtil.typeGet(beanClass, Table.class);
+    if (table != null && !isEmpty(table.name())) {
       // Note: empty catalog and schema are converted to null
       // Only need to convert quoted identifiers from annotations
-      return new TableName(quoteIdentifiers(t.catalog()), quoteIdentifiers(t.schema()), quoteIdentifiers(t.name()));
+      return new TableName(quoteIdentifiers(table.catalog()), quoteIdentifiers(table.schema()), quoteIdentifiers(table.name()));
     }
-
     // No annotation
     return null;
   }

src/main/java/io/ebean/config/ModuleInfo.java

@@ -18,4 +18,9 @@ public @interface ModuleInfo {
    * The db name prefix is added to entity classes for non default databases.
    */
   String[] entities() default {};
+
+  /**
+   * Other classes like Attribute Converters.
+   */
+  String[] other() default {};
 }

src/main/java/io/ebean/config/PlatformConfig.java

@@ -34,6 +34,11 @@ public class PlatformConfig {
    */
   private String databaseBooleanFalse;
 
+  /**
+   * For DB's using sequences this is the number of sequence values prefetched.
+   */
+  private int databaseSequenceBatchSize = 20;
+
   /**
    * Set for DB's that support both Sequence and Identity (and the default choice is not desired).
    */
@@ -74,6 +79,7 @@ public class PlatformConfig {
   public PlatformConfig(PlatformConfig platformConfig) {
     this.databaseBooleanFalse = platformConfig.databaseBooleanFalse;
     this.databaseBooleanTrue = platformConfig.databaseBooleanTrue;
+    this.databaseSequenceBatchSize = platformConfig.databaseSequenceBatchSize;
     this.idType = platformConfig.idType;
     this.geometrySRID = platformConfig.geometrySRID;
     this.dbUuid = platformConfig.dbUuid;
@@ -167,6 +173,20 @@ public class PlatformConfig {
     this.databaseBooleanFalse = databaseBooleanFalse;
   }
 
+  /**
+   * Return the number of DB sequence values that should be preallocated.
+   */
+  public int getDatabaseSequenceBatchSize() {
+    return databaseSequenceBatchSize;
+  }
+
+  /**
+   * Set the number of DB sequence values that should be preallocated.
+   */
+  public void setDatabaseSequenceBatchSize(int databaseSequenceBatchSize) {
+    this.databaseSequenceBatchSize = databaseSequenceBatchSize;
+  }
+
   /**
    * Return the Geometry SRID.
    */
@@ -274,6 +294,7 @@ public class PlatformConfig {
   public void loadSettings(PropertiesWrapper p) {
 
     idType = p.getEnum(IdType.class, "idType", idType);
+    databaseSequenceBatchSize = p.getInt("databaseSequenceBatchSize", databaseSequenceBatchSize);
     databaseBooleanTrue = p.get("databaseBooleanTrue", databaseBooleanTrue);
     databaseBooleanFalse = p.get("databaseBooleanFalse", databaseBooleanFalse);
     databaseInetAddressVarchar = p.getBoolean("databaseInetAddressVarchar", databaseInetAddressVarchar);

src/main/java/io/ebean/config/ServerConfig.java

@@ -44,6 +44,8 @@ import java.util.Properties;
 import java.util.ServiceLoader;
 
 /**
+ * Deprecated - please migrate to <code>io.ebean.DatabaseConfig</code>.
+ *
  * The configuration used for creating a Database.
  * <p>
  * Used to programmatically construct a Database and optionally register it
@@ -80,6 +82,7 @@ import java.util.ServiceLoader;
  * @author rbygrave
  * @see DatabaseFactory
  */
+@Deprecated
 public class ServerConfig {
 
   /**
@@ -139,7 +142,7 @@ public class ServerConfig {
    * Having this on and registering entity classes means we don't need to manually
    * write that code or use classpath scanning to find entity classes.
    */
-  private boolean loadModuleInfo;
+  private boolean loadModuleInfo = true;
 
   /**
    * List of interesting classes such as entities, embedded, ScalarTypes,
@@ -331,18 +334,6 @@ public class ServerConfig {
    */
   private ClassLoadConfig classLoadConfig = new ClassLoadConfig();
 
-  /**
-   * Set to true if the DataSource uses autoCommit.
-   * <p>
-   * Indicates that Ebean should use autoCommit friendly Transactions and TransactionManager.
-   */
-  private boolean autoCommitMode;
-
-  /**
-   * Set to true if transaction begin should be started with explicit statement.
-   */
-  private boolean explicitTransactionBeginMode;
-
   /**
    * The data source JNDI name if using a JNDI DataSource.
    */
@@ -475,6 +466,11 @@ public class ServerConfig {
 
   private String enabledL2Regions;
 
+  /**
+   * Set to true to effectively disable L2 cache plugins.
+   */
+  private boolean localOnlyL2Cache;
+
   /**
    * Should the javax.validation.constraints.NotNull enforce a notNull column in DB.
    * If set to false, use io.ebean.annotation.NotNull or Column(nullable=true).
@@ -1050,6 +1046,18 @@ public class ServerConfig {
     this.lazyLoadBatchSize = lazyLoadBatchSize;
   }
 
+  /**
+   * Set the number of sequences to fetch/preallocate when using DB sequences.
+   * <p>
+   * This is a performance optimisation to reduce the number times Ebean
+   * requests a sequence to be used as an Id for a bean (aka reduce network
+   * chatter).
+   * </p>
+   */
+  public void setDatabaseSequenceBatchSize(int databaseSequenceBatchSize) {
+    platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
+  }
+
   /**
    * Return the default JDBC fetchSize hint for findList queries.
    */
@@ -1728,42 +1736,6 @@ public class ServerConfig {
     this.dataSourceJndiName = dataSourceJndiName;
   }
 
-  /**
-   * Return true if autoCommit mode is on. This indicates to Ebean to use autoCommit friendly Transactions and TransactionManager.
-   */
-  public boolean isAutoCommitMode() {
-    return autoCommitMode;
-  }
-
-  /**
-   * Set to true if autoCommit mode is on and Ebean should use autoCommit friendly Transactions and TransactionManager.
-   */
-  public void setAutoCommitMode(boolean autoCommitMode) {
-    this.autoCommitMode = autoCommitMode;
-  }
-
-  /**
-   * Return true if transaction begin should be started with explicit statement.
-   */
-  public boolean isExplicitTransactionBeginMode() {
-    return explicitTransactionBeginMode;
-  }
-
-  /**
-   * Set to true if transaction begin should be started with explicit statement.
-   * <p>
-   * This works for H2 and Postgres but not for Oracle - only use this if you first name
-   * is Daryl or you have explicitly talked to Rob about this feature.
-   * </p>
-   * <p>
-   * This is generally not expected to be turned on but instead allow transactions to start
-   * implicitly which is generally the standard approach.
-   * </p>
-   */
-  public void setExplicitTransactionBeginMode(boolean explicitTransactionBeginMode) {
-    this.explicitTransactionBeginMode = explicitTransactionBeginMode;
-  }
-
   /**
    * Return a value used to represent TRUE in the database.
    * <p>
@@ -1816,6 +1788,32 @@ public class ServerConfig {
     this.platformConfig.setDatabaseBooleanFalse(databaseFalse);
   }
 
+  /**
+   * Return the number of DB sequence values that should be preallocated.
+   */
+  public int getDatabaseSequenceBatchSize() {
+    return platformConfig.getDatabaseSequenceBatchSize();
+  }
+
+  /**
+   * Set the number of DB sequence values that should be preallocated and cached
+   * by Ebean.
+   * <p>
+   * This is only used for DB's that use sequences and is a performance
+   * optimisation. This reduces the number of times Ebean needs to get a
+   * sequence value from the Database reducing network chatter.
+   * </p>
+   * <p>
+   * By default this value is 10 so when we need another Id (and don't have one
+   * in our cache) Ebean will fetch 10 id's from the database. Note that when
+   * the cache drops to have full (which is 5 by default) Ebean will fetch
+   * another batch of Id's in a background thread.
+   * </p>
+   */
+  public void setDatabaseSequenceBatch(int databaseSequenceBatchSize) {
+    this.platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
+  }
+
   /**
    * Return the database platform name (can be null).
    * <p>
@@ -2761,7 +2759,7 @@ public class ServerConfig {
    */
   protected void loadDataSourceSettings(PropertiesWrapper p) {
     dataSourceConfig.loadSettings(p.properties, name);
-    readOnlyDataSourceConfig.loadSettings(p.properties, name);
+    readOnlyDataSourceConfig.loadSettings(p.properties, name + "-ro");
   }
 
   /**
@@ -2822,10 +2820,9 @@ public class ServerConfig {
     collectQueryPlanThresholdMicros = p.getLong("collectQueryPlanThresholdMicros", collectQueryPlanThresholdMicros);
     docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
     disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
+    localOnlyL2Cache = p.getBoolean("localOnlyL2Cache", localOnlyL2Cache);
     enabledL2Regions = p.get("enabledL2Regions", enabledL2Regions);
     notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
-    explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);
-    autoCommitMode = p.getBoolean("autoCommitMode", autoCommitMode);
     useJtaTransactionManager = p.getBoolean("useJtaTransactionManager", useJtaTransactionManager);
     useJavaxValidationNotNull = p.getBoolean("useJavaxValidationNotNull", useJavaxValidationNotNull);
     autoReadOnlyDataSource = p.getBoolean("autoReadOnlyDataSource", autoReadOnlyDataSource);
@@ -3062,6 +3059,20 @@ public class ServerConfig {
     this.disableL2Cache = disableL2Cache;
   }
 
+  /**
+   * Return true to use local only L2 cache. Effectively ignore l2 cache plugin like ebean-redis etc.
+   */
+  public boolean isLocalOnlyL2Cache() {
+    return localOnlyL2Cache;
+  }
+
+  /**
+   * Force the use of local only L2 cache. Effectively ignore l2 cache plugin like ebean-redis etc.
+   */
+  public void setLocalOnlyL2Cache(boolean localOnlyL2Cache) {
+    this.localOnlyL2Cache = localOnlyL2Cache;
+  }
+
   /**
    * Returns if we use javax.validation.constraints.NotNull
    */
@@ -3260,6 +3271,17 @@ public class ServerConfig {
     return loadModuleInfo && classes.isEmpty();
   }
 
+  /**
+   * Set false to turn off automatic registration of entity beans.
+   * <p>
+   * When using query beans that also generates a module info class that
+   * can register the entity bean classes (to avoid classpath scanning).
+   * This is on by default and setting this to false turns it off.
+   */
+  public void setLoadModuleInfo(boolean loadModuleInfo) {
+    this.loadModuleInfo = loadModuleInfo;
+  }
+
   public enum UuidVersion {
     VERSION4,
     VERSION1,

src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java

@@ -43,11 +43,8 @@ public abstract class AbstractDbEncrypt implements DbEncrypt {
   public DbEncryptFunction getDbEncryptFunction(int jdbcType) {
     switch (jdbcType) {
       case Types.VARCHAR:
-        return varcharEncryptFunction;
       case Types.CLOB:
-        return varcharEncryptFunction;
       case Types.CHAR:
-        return varcharEncryptFunction;
       case Types.LONGVARCHAR:
         return varcharEncryptFunction;
 

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

@@ -110,6 +110,10 @@ public class DatabasePlatform {
    */
   protected DbIdentity dbIdentity = new DbIdentity();
 
+  protected boolean sequenceBatchMode = true;
+
+  protected int sequenceBatchSize = 20;
+
   /**
    * The history support for this database platform.
    */
@@ -142,7 +146,7 @@ public class DatabasePlatform {
 
   protected String truncateTable = "truncate table %s";
 
-  protected String columnAliasPrefix = "c";
+  protected String columnAliasPrefix;
 
   /**
    * Use a BackTick ` at the beginning and end of table or column names that you
@@ -231,6 +235,7 @@ public class DatabasePlatform {
    * Configure the platform given the server configuration.
    */
   public void configure(PlatformConfig config) {
+    this.sequenceBatchSize = config.getDatabaseSequenceBatchSize();
     this.caseSensitiveCollation = config.isCaseSensitiveCollation();
     configureIdType(config.getIdType());
     configure(config, config.isAllQuotedIdentifiers());
@@ -293,6 +298,20 @@ public class DatabasePlatform {
     return platform.name().toLowerCase();
   }
 
+  /**
+   * Return true if we are using Sequence batch mode rather than STEP.
+   */
+  public boolean isSequenceBatchMode() {
+    return sequenceBatchMode;
+  }
+
+  /**
+   * Set to false to not use sequence batch mode but instead STEP mode.
+   */
+  public void setSequenceBatchMode(boolean sequenceBatchMode) {
+    this.sequenceBatchMode = sequenceBatchMode;
+  }
+
   /**
    * Return true if this database platform supports native ILIKE expression.
    */
@@ -362,13 +381,13 @@ public class DatabasePlatform {
   /**
    * Return a DB Sequence based IdGenerator.
    *
-   * @param be        the BackgroundExecutor that can be used to load the sequence if
-   *                  desired
-   * @param ds        the DataSource
-   * @param increment the sequence allocation size as defined by mapping (defaults to 50)
-   * @param seqName   the name of the sequence
+   * @param be       the BackgroundExecutor that can be used to load the sequence if
+   *                 desired
+   * @param ds       the DataSource
+   * @param stepSize the sequence allocation size as defined by mapping (defaults to 50)
+   * @param seqName  the name of the sequence
    */
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
     return null;
   }
 

src/main/java/io/ebean/config/dbplatform/DbEncrypt.java

@@ -7,30 +7,18 @@ package io.ebean.config.dbplatform;
  * As an alternative to using DB encryption you can encrypt/decrypt in java via
  * a special ScalarType but this has the limitation that you can't include that
  * property in query where clauses.
- * </p>
- *
- * @author rbygrave
  */
 public interface DbEncrypt {
 
-  // /**
-  // * Return the SQL for decrypting a column returning a VARCHAR.
-  // */
-  // String getDecryptSql(String columnWithTableAlias);
-  //
-  // /**
-  // * Return the DB function with bind variables used to encrypt a VARCHAR
-  // * value.
-  // */
-  // String getEncryptBindSql();
-
+  /**
+   * Return the DB encrypt function for the given JDBC type.
+   */
   DbEncryptFunction getDbEncryptFunction(int jdbcType);
 
   /**
    * Return the DB type that encrypted Strings are stored in.
    * <p>
    * This is VARCHAR for MySql and VARBINARY for most others.
-   * </p>
    */
   int getEncryptDbType();
 

src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java

@@ -116,7 +116,7 @@ public class DbPlatformTypeMapping {
 
     } else {
       put(DbType.VARCHAR, new DbPlatformType("varchar", 255));
-      put(DbType.DECIMAL, new DbPlatformType("decimal", 38));
+      put(DbType.DECIMAL, new DbPlatformType("decimal", 16, 3));
       put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
       put(DbType.BINARY, new DbPlatformType("binary", 255));
       put(DbType.CHAR, new DbPlatformType("char", 1));

src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java

@@ -0,0 +1,57 @@
+package io.ebean.config.dbplatform;
+
+import io.ebean.BackgroundExecutor;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Database sequence based IdGenerator using Sequence Step 1 but batch fetch many sequence values.
+ */
+public abstract class SequenceBatchIdGenerator extends SequenceIdGenerator {
+
+  /**
+   * Construct where batchSize is the sequence step size.
+   *
+   */
+  public SequenceBatchIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+    super(be, ds, seqName, batchSize);
+  }
+
+  /**
+   * If allocateSize is large load some sequences in a background thread.
+   * <p>
+   * For example, when inserting a bean with a cascade on a OneToMany with many
+   * beans Ebean can call this to ensure .
+   * </p>
+   */
+  @Override
+  public void preAllocateIds(int requestSize) {
+    if (allocationSize > 1 && requestSize > allocationSize) {
+      // only bother if allocateSize is bigger than
+      // the normal loading batchSize
+      if (requestSize > 100) {
+        // max out at 100 for now
+        requestSize = 100;
+      }
+      loadInBackground(requestSize);
+    }
+  }
+
+  /**
+   * Add the next set of Ids as the next value plus all the following numbers up to the step size.
+   */
+  @Override
+  protected List<Long> readIds(ResultSet resultSet, int loadSize) throws SQLException {
+
+    List<Long> newIds = new ArrayList<>(loadSize);
+    while (resultSet.next()) {
+      newIds.add(resultSet.getLong(1));
+    }
+    return newIds;
+  }
+
+}

src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java

@@ -59,7 +59,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     this.allocationSize = allocationSize;
   }
 
-  public abstract String getSql();
+  public abstract String getSql(int batchSize);
 
   /**
    * Returns the sequence name.
@@ -102,7 +102,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
       if (size > 0) {
         maybeLoadMoreInBackground(size);
       } else {
-        loadMore();
+        loadMore(allocationSize);
       }
       return idList.pollFirst();
     }
@@ -116,8 +116,8 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     }
   }
 
-  private void loadMore() {
-    List<Long> newIds = getMoreIds();
+  private void loadMore(int requestSize) {
+    List<Long> newIds = getMoreIds(requestSize);
     synchronized (monitor) {
       idList.addAll(newIds);
     }
@@ -139,7 +139,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
       currentlyBackgroundLoading = true;
 
       backgroundExecutor.execute(() -> {
-        loadMore();
+        loadMore(requestSize);
         synchronized (backgroundLoadMonitor) {
           currentlyBackgroundLoading = false;
         }
@@ -150,14 +150,14 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
   /**
    * Read the resultSet returning the list of Id values.
    */
-  protected abstract List<Long> readIds(ResultSet resultSet) throws SQLException;
+  protected abstract List<Long> readIds(ResultSet resultSet, int loadSize) throws SQLException;
 
   /**
    * Get more Id's by executing a query and reading the Id's returned.
    */
-  protected List<Long> getMoreIds() {
+  protected List<Long> getMoreIds(int requestSize) {
 
-    String sql = getSql();
+    String sql = getSql(requestSize);
 
     Connection connection = null;
     PreparedStatement statement = null;
@@ -168,7 +168,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
       statement = connection.prepareStatement(sql);
       resultSet = statement.executeQuery();
 
-      List<Long> newIds = readIds(resultSet);
+      List<Long> newIds = readIds(resultSet, requestSize);
       if (logger.isTraceEnabled()) {
         logger.trace("seq:{} loaded:{} sql:{}", seqName, newIds.size(), sql);
       }

src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java

@@ -13,25 +13,19 @@ import java.util.List;
  */
 public abstract class SequenceStepIdGenerator extends SequenceIdGenerator {
 
-  private final String nextSql;
   /**
    * Construct with stepSize (typically 50).
    */
-  protected SequenceStepIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int stepSize, String nextSql) {
+  protected SequenceStepIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
     super(be, ds, seqName, stepSize);
-    this.nextSql = nextSql;
-  }
-
-  @Override
-  public String getSql() {
-    return nextSql;
   }
 
   /**
    * Add the next set of Ids as the next value plus all the following numbers up to the step size.
    */
   @Override
-  protected List<Long> readIds(ResultSet resultSet) throws SQLException {
+  protected List<Long> readIds(ResultSet resultSet, int ignoreRequestSize) throws SQLException {
+
     List<Long> newIds = new ArrayList<>(allocationSize);
     if (resultSet.next()) {
       long start = resultSet.getLong(1);

src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java

@@ -16,10 +16,8 @@ public class ClickHousePlatform extends DatabasePlatform {
     //this.dbEncrypt =
     //this.historySupport =
     //this.exceptionTranslator =
-
     this.nativeUuidType = true;
     this.dbDefaultValue.setNow("now()");
-    this.columnAliasPrefix = null;
 
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(false);
@@ -34,7 +32,7 @@ public class ClickHousePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("UInt16", false));
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("UInt32", false));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("UInt64", false));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 16,4));
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 16, 3));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("Float64", false));
 
     dbTypeMap.put(DbType.DATE, new DbPlatformType("Date", false));

src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java

@@ -42,8 +42,7 @@ public class DB2Platform extends DatabasePlatform {
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("bigint", false));
     dbTypeMap.put(DbType.REAL, new DbPlatformType("real"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("decimal", 15));
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("decimal", 16, 3));
     persistBatchOnCascade = PersistBatch.NONE;
   }
 
@@ -52,8 +51,9 @@ public class DB2Platform extends DatabasePlatform {
    * sequence values.
    */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
-    return new DB2Sequence(be, ds, seqName, increment);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+
+    return new DB2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
 }

src/main/java/io/ebean/config/dbplatform/db2/DB2Sequence.java

@@ -1,17 +0,0 @@
-package io.ebean.config.dbplatform.db2;
-
-import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceStepIdGenerator;
-
-import javax.sql.DataSource;
-
-/**
- * DB2 specific sequence Id Generator.
- */
-class DB2Sequence extends SequenceStepIdGenerator {
-
-  DB2Sequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
-    super(be, ds, seqName, stepSize, "values nextval for " + seqName);
-  }
-
-}

src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java

@@ -0,0 +1,35 @@
+package io.ebean.config.dbplatform.db2;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;
+
+import javax.sql.DataSource;
+
+/**
+ * DB2 specific sequence Id Generator.
+ */
+public class DB2SequenceIdGenerator extends SequenceBatchIdGenerator {
+
+  private final String baseSql;
+  private final String unionBaseSql;
+
+  /**
+   * Construct given a dataSource and sql to return the next sequence value.
+   */
+  public DB2SequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+    super(be, ds, seqName, batchSize);
+    this.baseSql = "values nextval for " + seqName;
+    this.unionBaseSql = " union " + baseSql;
+  }
+
+  @Override
+  public String getSql(int batchSize) {
+
+    StringBuilder sb = new StringBuilder();
+    sb.append(baseSql);
+    for (int i = 1; i < batchSize; i++) {
+      sb.append(unionBaseSql);
+    }
+    return sb.toString();
+  }
+}

src/main/java/io/ebean/config/dbplatform/h2/H2DbSequence.java

@@ -1,14 +0,0 @@
-package io.ebean.config.dbplatform.h2;
-
-import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceStepIdGenerator;
-
-import javax.sql.DataSource;
-
-class H2DbSequence extends SequenceStepIdGenerator {
-
-  H2DbSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
-    super(be, ds, seqName, stepSize, "select " + seqName + ".nextval");
-  }
-
-}

src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java

@@ -26,7 +26,6 @@ public class H2Platform extends DatabasePlatform {
     this.supportsDeleteTableAlias = true;
     this.inlineSqlUpdateLimit = true;
     this.dbDefaultValue.setNow("now()");
-    this.columnAliasPrefix = null;
     this.exceptionTranslator =
       new SqlErrorCodes()
         .addAcquireLock("50200","HYT00")
@@ -42,9 +41,13 @@ public class H2Platform extends DatabasePlatform {
     dbTypeMap.put(DbType.UUID, new DbPlatformType("uuid", false));
   }
 
+  /**
+   * Return a H2 specific sequence IdGenerator that supports batch fetching
+   * sequence values.
+   */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
-    return new H2DbSequence(be, ds, seqName, increment);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new H2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
   @Override

src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java

@@ -0,0 +1,35 @@
+package io.ebean.config.dbplatform.h2;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;
+
+import javax.sql.DataSource;
+
+/**
+ * H2 specific sequence Id Generator.
+ */
+public class H2SequenceIdGenerator extends SequenceBatchIdGenerator {
+
+  private final String baseSql;
+  private final String unionBaseSql;
+
+  /**
+   * Construct given a dataSource and sql to return the next sequence value.
+   */
+  public H2SequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+    super(be, ds, seqName, batchSize);
+    this.baseSql = "select " + seqName + ".nextval";
+    this.unionBaseSql = " union " + baseSql;
+  }
+
+  @Override
+  public String getSql(int batchSize) {
+
+    StringBuilder sb = new StringBuilder();
+    sb.append(baseSql);
+    for (int i = 1; i < batchSize; i++) {
+      sb.append(unionBaseSql);
+    }
+    return sb.toString();
+  }
+}

src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java

@@ -17,7 +17,6 @@ public class HanaPlatform extends DatabasePlatform {
     this.sqlLimiter = new HanaSqlLimiter();
     this.persistBatchOnCascade = PersistBatch.NONE;
     this.supportsResultSetConcurrencyModeUpdatable = false;
-    this.columnAliasPrefix = null;
     this.historySupport = new HanaHistorySupport();
     this.basicSqlLimiter = new HanaBasicSqlLimiter();
 

src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java

@@ -0,0 +1,38 @@
+package io.ebean.config.dbplatform.hsqldb;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.config.dbplatform.DbType;
+import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.dbplatform.PlatformIdGenerator;
+import io.ebean.config.dbplatform.h2.H2DbEncrypt;
+import io.ebean.config.dbplatform.h2.H2SequenceIdGenerator;
+
+import javax.sql.DataSource;
+
+/**
+ * H2 specific platform.
+ */
+public class HsqldbPlatform extends DatabasePlatform {
+
+  public HsqldbPlatform() {
+    super();
+    this.platform = Platform.HSQLDB;
+    this.dbEncrypt = new H2DbEncrypt();
+    this.truncateTable = "delete from %s";
+    this.dbIdentity.setIdType(IdType.IDENTITY);
+    this.dbIdentity.setSupportsGetGeneratedKeys(true);
+    this.dbIdentity.setSupportsSequence(true);
+    this.dbIdentity.setSupportsIdentity(true);
+
+    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
+  }
+
+  @Override
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new H2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
+  }
+
+}

src/main/java/io/ebean/config/dbplatform/hsqldb/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Hsqldb specific support.
+ */
+package io.ebean.config.dbplatform.hsqldb;

src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbHistorySupport.java

@@ -0,0 +1,38 @@
+package io.ebean.config.dbplatform.mariadb;
+
+import io.ebean.config.dbplatform.DbStandardHistorySupport;
+
+/**
+ * History support for MariaDB.
+ */
+public class MariaDbHistorySupport extends DbStandardHistorySupport {
+
+    /**
+     * Return the ' as of timestamp ?' clause appended after the table name.
+     */
+    @Override
+    public String getAsOfViewSuffix(String asOfViewSuffix) {
+        return " for system_time as of ?";
+    }
+
+    @Override
+    public String getVersionsBetweenSuffix(String asOfViewSuffix) {
+        return " for system_time between ? and ?";
+    }
+
+    /**
+     * Returns the SQL Server specific effective start column.
+     */
+    @Override
+    public String getSysPeriodLower(String tableAlias, String sysPeriod) {
+        return tableAlias + "." + sysPeriod + "From";
+    }
+
+    /**
+     * Returns the SQL Server specific effective end column.
+     */
+    @Override
+    public String getSysPeriodUpper(String tableAlias, String sysPeriod) {
+        return tableAlias + "." + sysPeriod + "To";
+    }
+}

src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java

@@ -0,0 +1,16 @@
+package io.ebean.config.dbplatform.mariadb;
+
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.mysql.BaseMySqlPlatform;
+
+/**
+ * MariaDB platform.
+ */
+public class MariaDbPlatform extends BaseMySqlPlatform {
+
+  public MariaDbPlatform() {
+    super();
+    this.platform = Platform.MARIADB;
+    this.historySupport = new MariaDbHistorySupport();
+  }
+}

src/main/java/io/ebean/config/dbplatform/mysql/BaseMySqlPlatform.java

@@ -0,0 +1,68 @@
+package io.ebean.config.dbplatform.mysql;
+
+import io.ebean.Query;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.config.dbplatform.DbType;
+import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.dbplatform.SqlErrorCodes;
+
+import java.sql.Types;
+
+/**
+ * Base platform for both MySql and MariaDB.
+ */
+public abstract class BaseMySqlPlatform extends DatabasePlatform {
+
+  public BaseMySqlPlatform() {
+    super();
+    this.useExtraTransactionOnIterateSecondaryQueries = true;
+    this.selectCountWithAlias = true;
+    this.supportsSavepointId = false;
+    this.inlineSqlUpdateLimit = true;
+    this.dbEncrypt = new MySqlDbEncrypt();
+    this.historySupport = new MySqlHistorySupport();
+    this.dbIdentity.setIdType(IdType.IDENTITY);
+    this.dbIdentity.setSupportsGetGeneratedKeys(true);
+    this.dbIdentity.setSupportsIdentity(true);
+    this.dbIdentity.setSupportsSequence(false);
+
+    this.dbDefaultValue.setNow("now(6)"); // must have same precision as TIMESTAMP
+    this.dbDefaultValue.setFalse("0");
+    this.dbDefaultValue.setTrue("1");
+
+
+    this.exceptionTranslator =
+      new SqlErrorCodes()
+        .addAcquireLock("1205")
+        .addDuplicateKey("1062", "1169")
+        .addDataIntegrity("630", "839", "840", "893", "1215", "1216", "1217", "1364", "1451", "1452", "1557")
+        .build();
+
+    this.openQuote = "`";
+    this.closeQuote = "`";
+    // use pipe for escaping as it depends if mysql runs in no_backslash_escapes or not.
+    this.likeClauseRaw = "like ? escape''";
+    this.likeClauseEscaped = "like ? escape'|'";
+
+    this.forwardOnlyHintOnFindIterate = true;
+    this.booleanDbType = Types.BIT;
+
+    dbTypeMap.put(DbType.BIT, new DbPlatformType("tinyint(1)"));
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("tinyint(1)"));
+    dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime(6)"));
+    dbTypeMap.put(DbType.CLOB, new MySqlClob());
+    dbTypeMap.put(DbType.BLOB, new MySqlBlob());
+    dbTypeMap.put(DbType.BINARY, new DbPlatformType("binary", 255));
+    dbTypeMap.put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
+    dbTypeMap.put(DbType.JSON, new DbPlatformType("json", false));
+    dbTypeMap.put(DbType.JSONB, new DbPlatformType("json", false));
+  }
+
+  @Override
+  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
+    // NOWAIT and SKIP LOCKED currently not supported with MySQL
+    return sql + " for update";
+  }
+
+}

src/main/java/io/ebean/config/dbplatform/mysql/MySql55Platform.java

@@ -4,7 +4,7 @@ import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 
-public class MySql55Platform extends MySqlPlatform {
+public class MySql55Platform extends BaseMySqlPlatform {
 
   public MySql55Platform() {
     super();

src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java

@@ -1,78 +1,15 @@
 package io.ebean.config.dbplatform.mysql;
 
-import io.ebean.Query;
 import io.ebean.annotation.Platform;
-import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.config.dbplatform.DbType;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.dbplatform.SqlErrorCodes;
-
-import java.sql.Types;
 
 /**
  * MySQL specific platform.
- * <p>
- * <ul>
- * <li>supportsGetGeneratedKeys = true</li>
- * <li>Uses LIMIT OFFSET clause</li>
- * <li>Uses ` for quoted identifiers</li>
- * </ul>
- * </p>
  */
-public class MySqlPlatform extends DatabasePlatform {
+public class MySqlPlatform extends BaseMySqlPlatform {
 
   public MySqlPlatform() {
     super();
     this.platform = Platform.MYSQL;
-    this.useExtraTransactionOnIterateSecondaryQueries = true;
-    this.selectCountWithAlias = true;
-    this.supportsSavepointId = false;
-    this.inlineSqlUpdateLimit = true;
-    this.dbEncrypt = new MySqlDbEncrypt();
-    this.historySupport = new MySqlHistorySupport();
-    this.columnAliasPrefix = null;
-    this.dbIdentity.setIdType(IdType.IDENTITY);
-    this.dbIdentity.setSupportsGetGeneratedKeys(true);
-    this.dbIdentity.setSupportsIdentity(true);
-    this.dbIdentity.setSupportsSequence(false);
-
-    this.dbDefaultValue.setNow("now(6)"); // must have same precision as TIMESTAMP
-    this.dbDefaultValue.setFalse("0");
-    this.dbDefaultValue.setTrue("1");
-
-
-    this.exceptionTranslator =
-      new SqlErrorCodes()
-        .addAcquireLock("1205")
-        .addDuplicateKey("1062", "1169")
-        .addDataIntegrity("630", "839", "840", "893", "1215", "1216", "1217", "1364", "1451", "1452", "1557")
-        .build();
-
-    this.openQuote = "`";
-    this.closeQuote = "`";
-    // use pipe for escaping as it depends if mysql runs in no_backslash_escapes or not.
-    this.likeClauseRaw = "like ? escape''";
-    this.likeClauseEscaped = "like ? escape'|'";
-
-    this.forwardOnlyHintOnFindIterate = true;
-    this.booleanDbType = Types.BIT;
-
-    dbTypeMap.put(DbType.BIT, new DbPlatformType("tinyint(1)"));
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("tinyint(1)"));
-    dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime(6)"));
-    dbTypeMap.put(DbType.CLOB, new MySqlClob());
-    dbTypeMap.put(DbType.BLOB, new MySqlBlob());
-    dbTypeMap.put(DbType.BINARY, new DbPlatformType("binary", 255));
-    dbTypeMap.put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
-    dbTypeMap.put(DbType.JSON, new DbPlatformType("json", false));
-    dbTypeMap.put(DbType.JSONB, new DbPlatformType("json", false));
-  }
-
-  @Override
-  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
-    // NOWAIT and SKIP LOCKED currently not supported with MySQL
-    return sql + " for update";
   }
 
 }

src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java

@@ -23,7 +23,6 @@ public class NuoDbPlatform extends DatabasePlatform {
     this.idInExpandedForm = true;
     this.supportsResultSetConcurrencyModeUpdatable = false;
     this.supportsDeleteTableAlias = true;
-    this.columnAliasPrefix = null;
     this.likeClauseRaw = "like ?";
     this.historySupport = new NuoDbHistorySupport();
     //this.dbEncrypt = ...
@@ -44,8 +43,8 @@ public class NuoDbPlatform extends DatabasePlatform {
   }
 
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
-    return new NuoDbSequence(be, ds, seqName, increment);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new NuoDbSequence(be, ds, seqName, stepSize);
   }
 
   @Override

src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbSequence.java

@@ -5,10 +5,20 @@ import io.ebean.config.dbplatform.SequenceStepIdGenerator;
 
 import javax.sql.DataSource;
 
-class NuoDbSequence extends SequenceStepIdGenerator {
+public class NuoDbSequence extends SequenceStepIdGenerator {
 
-  NuoDbSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
-    super(be, ds, seqName, stepSize, "select next value for " + seqName + " from dual");
+  private final String nextSql;
+
+  /**
+   * Construct where batchSize is the sequence step size.
+   */
+  public NuoDbSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
+    super(be, ds, seqName, stepSize);
+    this.nextSql = "select next value for " + seqName + " from dual";
   }
 
+  @Override
+  public String getSql(int batchSize) {
+    return nextSql;
+  }
 }

src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java

@@ -1,6 +1,7 @@
 package io.ebean.config.dbplatform.oracle;
 
 import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.IdType;
 
 /**
  * Oracle 11 platform using rownum sql limiting.
@@ -12,5 +13,6 @@ public class Oracle11Platform extends OraclePlatform {
     this.platform = Platform.ORACLE11;
     this.columnAliasPrefix = "c";
     this.sqlLimiter = new OracleRownumSqlLimiter();
+    dbIdentity.setIdType(IdType.SEQUENCE);
   }
 }

src/main/java/io/ebean/config/dbplatform/oracle/OracleDbSequence.java

@@ -1,14 +0,0 @@
-package io.ebean.config.dbplatform.oracle;
-
-import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceStepIdGenerator;
-
-import javax.sql.DataSource;
-
-class OracleDbSequence extends SequenceStepIdGenerator {
-
-  OracleDbSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
-    super(be, ds, seqName, stepSize, "select " + seqName + ".nextval from dual");
-  }
-
-}

src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java

@@ -22,7 +22,6 @@ public class OraclePlatform extends DatabasePlatform {
   public OraclePlatform() {
     super();
     this.platform = Platform.ORACLE;
-    this.columnAliasPrefix = null;
     this.supportsDeleteTableAlias = true;
     this.maxTableNameLength = 30;
     this.maxConstraintNameLength = 30;
@@ -31,7 +30,7 @@ public class OraclePlatform extends DatabasePlatform {
     this.basicSqlLimiter = new BasicSqlAnsiLimiter();
     this.historySupport = new OracleDbHistorySupport();
     this.truncateTable = "truncate table %s cascade";
-    dbIdentity.setIdType(IdType.SEQUENCE);
+    dbIdentity.setIdType(IdType.IDENTITY);
     dbIdentity.setSupportsSequence(true);
     dbIdentity.setSupportsIdentity(true);
     dbIdentity.setSupportsGetGeneratedKeys(true);
@@ -63,8 +62,7 @@ public class OraclePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("number", 19, 4));
     dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("number", 5));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("number", 3));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("number", 38));
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("number", 16, 3));
     dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("varchar2", 255));
 
     dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("blob"));
@@ -76,8 +74,8 @@ public class OraclePlatform extends DatabasePlatform {
   }
 
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
-    return new OracleDbSequence(be, ds, seqName, increment);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new OracleSequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
   @Override

src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java

@@ -0,0 +1,27 @@
+package io.ebean.config.dbplatform.oracle;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;
+
+import javax.sql.DataSource;
+
+/**
+ * Oracle specific sequence Id Generator.
+ */
+public class OracleSequenceIdGenerator extends SequenceBatchIdGenerator {
+
+  private final String baseSql;
+
+  /**
+   * Construct given a dataSource and sql to return the next sequence value.
+   */
+  public OracleSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+    super(be, ds, seqName, batchSize);
+    this.baseSql = "select " + seqName + ".nextval, a from (select level as a FROM dual CONNECT BY level <= ";
+  }
+
+  @Override
+  public String getSql(int batchSize) {
+    return baseSql + batchSize + ")";
+  }
+}

src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbSequence.java

@@ -1,14 +0,0 @@
-package io.ebean.config.dbplatform.postgres;
-
-import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceStepIdGenerator;
-
-import javax.sql.DataSource;
-
-class PostgresDbSequence extends SequenceStepIdGenerator {
-
-  PostgresDbSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
-    super(be, ds, seqName, stepSize, "select nextval('" + seqName + "')");
-  }
-
-}

src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java

@@ -34,7 +34,6 @@ public class PostgresPlatform extends DatabasePlatform {
     this.blobDbType = Types.LONGVARBINARY;
     this.clobDbType = Types.VARCHAR;
     this.nativeUuidType = true;
-    this.columnAliasPrefix = null;
     this.truncateTable = "truncate table %s cascade";
     this.dbEncrypt = new PostgresDbEncrypt();
     this.historySupport = new PostgresHistorySupport();
@@ -71,7 +70,6 @@ public class PostgresPlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float"));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("decimal", 38));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("timestamptz"));
 
     dbTypeMap.put(DbType.BINARY, dbBytea);
@@ -109,8 +107,9 @@ public class PostgresPlatform extends DatabasePlatform {
    * Create a Postgres specific sequence IdGenerator.
    */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
-    return new PostgresDbSequence(be, ds, seqName, increment);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+
+    return new PostgresSequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
   @Override

src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java

@@ -0,0 +1,27 @@
+package io.ebean.config.dbplatform.postgres;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;
+
+import javax.sql.DataSource;
+
+/**
+ * Postgres specific sequence Id Generator.
+ */
+public class PostgresSequenceIdGenerator extends SequenceBatchIdGenerator {
+
+  private final String baseSql;
+
+  /**
+   * Construct given a dataSource and sql to return the next sequence value.
+   */
+  public PostgresSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+    super(be, ds, seqName, batchSize);
+    this.baseSql = "select nextval('" + seqName + "'), s.generate_series from (select generate_series from generate_series(1,";
+  }
+
+  @Override
+  public String getSql(int batchSize) {
+    return baseSql + batchSize + ") ) as s";
+  }
+}

src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java

@@ -32,8 +32,7 @@ public class SqlAnywherePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28));
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 16, 3));
     dbTypeMap.put(DbType.BLOB, new DbPlatformType("binary(4500)"));
     dbTypeMap.put(DbType.CLOB, new DbPlatformType("long varchar"));
     dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("long binary"));

src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java

@@ -12,7 +12,6 @@ public class SqlServer17Platform extends SqlServerBasePlatform {
   public SqlServer17Platform() {
     super();
     this.platform = Platform.SQLSERVER17;
-    this.columnAliasPrefix = null;
     this.nativeUuidType = true;
     this.dbTypeMap.put(DbType.UUID, new DbPlatformType("uniqueidentifier", false));
   }

src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java

@@ -36,6 +36,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);
     this.dbIdentity.setSupportsSequence(true);
+    this.sequenceBatchMode = false;
 
     this.exceptionTranslator =
       new SqlErrorCodes()
@@ -61,9 +62,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28));
-
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 16, 3));
     dbTypeMap.put(DbType.DATE, new DbPlatformType("date"));
     dbTypeMap.put(DbType.TIME, new DbPlatformType("time"));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime2"));
@@ -94,9 +93,12 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     sb.append('[').append(ch).append(']');
   }
 
+  /**
+   * Create a Postgres specific sequence IdGenerator.
+   */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
-    return new SqlServerDbSequence(be, ds, seqName, increment);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new SqlServerStepSequence(be, ds, seqName, stepSize);
   }
 
   /**

src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerDbSequence.java

@@ -1,13 +0,0 @@
-package io.ebean.config.dbplatform.sqlserver;
-
-import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceStepIdGenerator;
-
-import javax.sql.DataSource;
-
-class SqlServerDbSequence extends SequenceStepIdGenerator {
-
-  SqlServerDbSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
-    super(be, ds, seqName, stepSize, "select next value for " + seqName);
-  }
-}

src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequence.java

@@ -0,0 +1,24 @@
+package io.ebean.config.dbplatform.sqlserver;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.config.dbplatform.SequenceStepIdGenerator;
+
+import javax.sql.DataSource;
+
+public class SqlServerStepSequence extends SequenceStepIdGenerator {
+
+  private final String nextSql;
+
+  /**
+   * Construct where batchSize is the sequence step size.
+   */
+  public SqlServerStepSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
+    super(be, ds, seqName, stepSize);
+    this.nextSql = "select next value for "+seqName;
+  }
+
+  @Override
+  public String getSql(int batchSize) {
+    return nextSql;
+  }
+}

src/main/java/io/ebean/text/csv/DefaultCsvCallback.java

@@ -171,7 +171,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
         logger.info("Creating transaction, batchSize[" + persistBatchSize + "]");
         transaction.setBatchMode(true);
         transaction.setBatchSize(persistBatchSize);
-        transaction.setBatchGetGeneratedKeys(false);
+        transaction.setGetGeneratedKeys(false);
 
       } else {
         // explicitly turn off JDBC batching in case

src/main/java/io/ebean/util/AnnotationUtil.java

@@ -1,304 +1,98 @@
 package io.ebean.util;
 
-import io.ebean.annotation.Formula;
-import io.ebean.annotation.Platform;
-import io.ebean.annotation.Where;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
-import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 /**
- * Annotation utility methods to find annotations recursively - taken from the spring framework.
+ * Annotation utility methods to find annotations.
  */
 public class AnnotationUtil {
 
   /**
    * Determine if the supplied {@link Annotation} is defined in the core JDK {@code java.lang.annotation} package.
    */
-  public static boolean isInJavaLangAnnotationPackage(Annotation annotation) {
-    return annotation.annotationType().getName().startsWith("java.lang.annotation");
+  public static boolean notJavaLang(Annotation annotation) {
+    return !annotation.annotationType().getName().startsWith("java.lang.annotation");
   }
 
   /**
-   * Find a single {@link Annotation} of {@code annotationType} on the supplied {@link AnnotatedElement}.
-   * <p>
-   * Meta-annotations will be searched if the annotation is not <em>directly present</em> on the supplied element.
-   * <p>
-   * <strong>Warning</strong>: this method operates generically on annotated elements. In other words, this method
-   * does not execute specialized search algorithms for classes or methods. It only traverses through Annotations!
-   * It also does not filter out platform dependent annotations!
+   * Simple get on field or method with no meta-annotations or platform filtering.
    */
-  @SuppressWarnings("unchecked")
-  public static <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType) {
-    if (annotationType == null) {
-      return null;
-    }
-    // check if directly present, if not, start search for meta-annotations.
-    Annotation[] anns = annotatedElement.getAnnotations();
-    if (anns.length == 0) {
-      return null; // no annotations present, so searching for meta annotations not required
-    }
-
-    // As we need the anns array anyway, we iterate over this instead
-    // of using annotatedElement.getAnnotation(...) which is synchronized internally
-    for (Annotation ann : anns) {
-      if (ann.annotationType() == annotationType) {
-        return (A) ann;
-      }
-    }
-
-    return findAnnotation(anns, annotationType, new HashSet<>());
-
+  public static <A extends Annotation> A get(AnnotatedElement element, Class<A> annotation) {
+    return element.getAnnotation(annotation);
   }
 
   /**
-   * Find a single {@link Annotation} of {@code annotationType} on the supplied class.
-   * <p>Meta-annotations will be searched if the annotation is not directly present on
-   * the supplied element.
-   * <p><strong>Note</strong>: this method searches for annotations at class & superClass(es)!
+   * Simple has with no meta-annotations or platform filtering.
    */
-  @SuppressWarnings("unchecked")
-  public static <A extends Annotation> A findAnnotationRecursive(Class<?> clazz, Class<A> annotationType) {
-    if (annotationType == null) {
-      return null;
-    }
+  public static <A extends Annotation> boolean has(AnnotatedElement element, Class<A> annotation) {
+    return get(element, annotation) != null;
+  }
 
+  /**
+   * On class get the annotation - includes inheritance.
+   */
+  public static <A extends Annotation> A typeGet(Class<?> clazz, Class<A> annotationType) {
     while (clazz != null && clazz != Object.class) {
-      // check if directly present, if not, start search for meta-annotations.
-      Annotation[] anns = clazz.getAnnotations();
-      if (anns.length != 0) {
-        for (Annotation ann : anns) {
-          if (ann.annotationType() == annotationType) {
-            return (A) ann;
-          }
-        }
-
-        A ann = findAnnotation(anns, annotationType, new HashSet<>());
-        if (ann != null) {
-          return ann;
-        }
+      final A val = clazz.getAnnotation(annotationType);
+      if (val != null) {
+        return val;
       }
-      // no meta-annotation present at this class - traverse to superclass
       clazz = clazz.getSuperclass();
     }
     return null;
-
   }
 
   /**
-   * Finds the first annotation of a type for this platform. (if annotation is platform specific, otherwise first
-   * found annotation is returned)
+   * On class get all the annotations - includes inheritance.
    */
-  public static <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType, Platform platform) {
-    if (annotationType == null) {
-      return null;
+  public static <A extends Annotation> Set<A> typeGetAll(Class<?> clazz, Class<A> annotationType) {
+    Set<A> result = new LinkedHashSet<>();
+    typeGetAllCollect(clazz, annotationType, result);
+    return result;
+  }
+
+  private static <A extends Annotation> void typeGetAllCollect(Class<?> clazz, Class<A> annotationType, Set<A> result) {
+    while (clazz != null && clazz != Object.class) {
+      final A val = clazz.getAnnotation(annotationType);
+      if (val != null) {
+        result.add(val);
+      }
+      clazz = clazz.getSuperclass();
     }
-    Set<A> anns = findAnnotations(annotatedElement, annotationType);
-    return getPlatformMatchingAnnotation(anns, platform);
   }
 
   /**
-   * Finds all annotations recusively for a class and its superclasses or interfaces.
+   * On class simple check for annotation - includes inheritance.
    */
-  public static <A extends Annotation> Set<A> findAnnotationsRecursive(Class<?> clazz, Class<A> annotationType) {
-    Objects.requireNonNull(annotationType);
-    Set<A> ret = new LinkedHashSet<>();
+  public static <A extends Annotation> boolean typeHas(Class<?> clazz, Class<A> annotation) {
+    return typeGet(clazz, annotation) != null;
+  }
+
+  /**
+   * Find all the annotations for the filter searching meta-annotations.
+   */
+  public static Set<Annotation> metaFindAllFor(AnnotatedElement element, Set<Class<?>> filter) {
     Set<Annotation> visited = new HashSet<>();
-    Set<Class<?>> visitedInterfaces = new HashSet<>();
-    while (clazz != null && !clazz.getName().startsWith("java.lang.")) {
-      findMetaAnnotationsRecursive(clazz, annotationType, ret, visited, visitedInterfaces);
-      clazz = clazz.getSuperclass();
+    Set<Annotation> result = new LinkedHashSet<>();
+    for (Annotation ann : element.getAnnotations()) {
+      metaAdd(ann, filter, visited, result);
     }
-    return ret;
+    return result;
   }
 
-  /**
-   * Searches the interfaces for annotations.
-   */
-  private static <A extends Annotation> void findMetaAnnotationsRecursive(Class<?> clazz,
-      Class<A> annotationType, Set<A> ret,
-      Set<Annotation> visited, Set<Class<?>> visitedInterfaces) {
-    findMetaAnnotations(clazz, annotationType, ret, visited);
-    for (Class<?> iface : clazz.getInterfaces()) {
-      if (!iface.getName().startsWith("java.lang.") && visitedInterfaces.add(iface)) {
-        findMetaAnnotationsRecursive(iface, annotationType, ret, visited, visitedInterfaces);
-      }
-    }
-  }
-
-  /**
-   * Perform the search algorithm avoiding endless recursion by tracking which
-   * annotations have already been visited.
-   */
-  @SuppressWarnings("unchecked")
-  private static <A extends Annotation> A findAnnotation(Annotation[] anns, Class<A> annotationType, Set<Annotation> visited) {
-
-
-    for (Annotation ann : anns) {
-      if (!isInJavaLangAnnotationPackage(ann) && visited.add(ann)) {
-        Annotation[] metaAnns = ann.annotationType().getAnnotations();
-        for (Annotation metaAnn : metaAnns) {
-          if (metaAnn.annotationType() == annotationType) {
-            return (A) metaAnn;
-          }
-        }
-        if (metaAnns.length > 0) {
-          A annotation = findAnnotation(metaAnns, annotationType, visited);
-          if (annotation != null) {
-            return annotation;
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Find all {@link Annotation}s of {@code annotationType} on the supplied {@link AnnotatedElement}.
-   * <p>
-   * Meta-annotations will be searched if the annotation is not <em>directly present</em> on the supplied element.
-   * <p>
-   * <strong>Warning</strong>: this method operates generically on annotated elements. In other words, this method
-   * does not execute specialized search algorithms for classes or methods. It only traverses through Annotations!
-   */
-  public static <A extends Annotation> Set<A> findAnnotations(AnnotatedElement annotatedElement, Class<A> annotationType) {
-    if (annotationType == null) {
-      return null;
-    }
-    Set<A> ret = new LinkedHashSet<>();
-    findMetaAnnotations(annotatedElement, annotationType, ret, new HashSet<>());
-    return ret;
-  }
-
-  /**
-   * Perform the search algorithm avoiding endless recursion by tracking which
-   * annotations have already been visited.
-   */
-  @SuppressWarnings("unchecked")
-  private static <A extends Annotation> void findMetaAnnotations(AnnotatedElement annotatedElement, Class<A> annotationType, Set<A> ret, Set<Annotation> visited) {
-
-    Annotation[] anns = annotatedElement.getAnnotations();
-    for (Annotation ann : anns) {
-      if (!isInJavaLangAnnotationPackage(ann) && visited.add(ann)) {
-        if (ann.annotationType() == annotationType) {
-          ret.add((A) ann);
-        } else {
-          Method repeatableValueMethod = getRepeatableValueMethod(ann, annotationType);
-          if (repeatableValueMethod != null) {
-            try {
-              A[] repeatedAnns = (A[]) repeatableValueMethod.invoke(ann);
-              for (Annotation repeatedAnn : repeatedAnns) {
-                ret.add((A) repeatedAnn);
-                findMetaAnnotations(repeatedAnn.annotationType(), annotationType, ret, visited);
-              }
-            } catch (Exception e) { // catch all exceptions (thrown by invoke)
-              throw new RuntimeException(e);
-            }
-          } else {
-            findMetaAnnotations(ann.annotationType(), annotationType, ret, visited);
-          }
+  private static void metaAdd(Annotation ann, Set<Class<?>> filter, Set<Annotation> visited, Set<Annotation> result) {
+    if (notJavaLang(ann) && visited.add(ann)) {
+      if (filter.contains(ann.annotationType())) {
+        result.add(ann);
+      } else {
+        for (Annotation metaAnn : ann.annotationType().getAnnotations()) {
+          metaAdd(metaAnn, filter, visited, result);
         }
       }
     }
   }
-
-  // caches for getRepeatableValueMethod
-  private static Method getNullMethod() {
-    try {
-      return AnnotationUtil.class.getDeclaredMethod("getNullMethod");
-    } catch (NoSuchMethodException e) {
-      return null;
-    }
-  }
-
-  private static final ConcurrentMap<Annotation, Method> valueMethods = new ConcurrentHashMap<>();
-  // only a non-null-marker the valueMethods - Cache
-  private static final Method nullMethod = getNullMethod();
-
-
-  /**
-   * Returns the <code>value()</code> method for a possible containerAnnotation.
-   * Method is retuned only, if its signature is <code>array of containingType</code>.
-   */
-  private static <A extends Annotation> Method getRepeatableValueMethod(
-    Annotation containerAnnotation, Class<A> containingType) {
-
-    Method method = valueMethods.get(containerAnnotation);
-    if (method == null) {
-      try {
-        method = containerAnnotation.annotationType().getMethod("value");
-      } catch (NoSuchMethodException e) {
-        method = nullMethod;
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-      Method prev = valueMethods.putIfAbsent(containerAnnotation, method);
-      method = prev == null ? method : prev;
-    }
-    if (method != nullMethod) {
-      Class<?> retType = method.getReturnType();
-      if (retType.isArray() && retType.getComponentType() == containingType) {
-        return method;
-      }
-    }
-    return null;
-  }
-
-
-  /**
-   * Finds a suitable annotation from <code>Set<T> anns</code> for this platform.
-   * To distinguish between platforms, annotation type <code>T</code> must define
-   * a method withthis signature:
-   * <p>
-   * <code>Class<? extends DatabasePlatform>[] platforms() default {};</code>
-   * </p>
-   * The finding rules are:
-   * <ol>
-   * <li>Check if T has method "platforms" if not, return <code>ann[0]</code></code>
-   * <li>find the annotation that is defined for <code>databasePlatform</code></li>
-   * <li>otherwise return the annotation for default platform (platforms = {})</li>
-   * <li>return null
-   * </ol>
-   * (This mechanism is currently used by {@link Where} and {@link Formula})
-   */
-  public static <T extends Annotation> T getPlatformMatchingAnnotation(Set<T> anns, Platform matchPlatform) {
-    if (anns.isEmpty()) {
-      return null;
-    }
-    Method getPlatformsMethod = null;
-    T fallback = null;
-    for (T ann : anns) {
-      try {
-        if (getPlatformsMethod == null) {
-          getPlatformsMethod = ann.getClass().getMethod("platforms");
-        }
-        if (!Platform[].class.isAssignableFrom(getPlatformsMethod.getReturnType())) {
-          return ann;
-        }
-        Platform[] platforms = (Platform[]) getPlatformsMethod.invoke(ann);
-        if (platforms.length == 0) {
-          fallback = ann;
-        } else {
-          for (Platform platform : platforms) {
-            if (matchPlatform == platform) {
-              return ann;
-            }
-          }
-        }
-      } catch (NoSuchMethodException e) {
-        return ann; // not platform specific - return first one
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-    return fallback;
-  }
-
 }

src/main/java/io/ebeaninternal/api/ScopeTrans.java

@@ -71,13 +71,13 @@ public class ScopeTrans {
         restoreBatchOnCascade = transaction.isBatchOnCascade();
         restoreBatchSize = transaction.getBatchSize();
         restoreBatchGeneratedKeys = transaction.getBatchGetGeneratedKeys();
-        restoreBatchFlushOnQuery = transaction.isBatchFlushOnQuery();
+        restoreBatchFlushOnQuery = transaction.isFlushOnQuery();
       }
       if (txScope.isBatchSet()) {
         transaction.setBatchMode(txScope.isBatchMode());
       }
       if (!txScope.isFlushOnQuery()) {
-        transaction.setBatchFlushOnQuery(false);
+        transaction.setFlushOnQuery(false);
       }
       if (txScope.isBatchOnCascadeSet()) {
         transaction.setBatchOnCascade(txScope.isBatchOnCascade());
@@ -86,7 +86,7 @@ public class ScopeTrans {
         transaction.setBatchSize(txScope.getBatchSize());
       }
       if (txScope.isSkipGeneratedKeys()) {
-        transaction.setBatchGetGeneratedKeys(false);
+        transaction.setGetGeneratedKeys(false);
       }
     }
 
@@ -136,7 +136,7 @@ public class ScopeTrans {
       transaction.commit();
     } else {
       nestedCommit = true;
-      transaction.setBatchFlushOnQuery(restoreBatchFlushOnQuery);
+      transaction.setFlushOnQuery(restoreBatchFlushOnQuery);
       if (restoreBatch != null) {
         transaction.setBatchMode(restoreBatch);
       }
@@ -147,7 +147,7 @@ public class ScopeTrans {
         transaction.setBatchSize(restoreBatchSize);
       }
       if (restoreBatchGeneratedKeys != null) {
-        transaction.setBatchGetGeneratedKeys(restoreBatchGeneratedKeys);
+        transaction.setGetGeneratedKeys(restoreBatchGeneratedKeys);
       }
     }
   }

src/main/java/io/ebeaninternal/api/SpiEbeanServer.java

@@ -147,7 +147,7 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
    *
    * @param tenantId For multi-tenant lazy loading provide the tenantId to use.
    */
-  SpiTransaction createQueryTransaction(Object tenantId);
+  SpiTransaction createReadOnlyTransaction(Object tenantId);
 
   /**
    * An event from another server in the cluster used to notify local

src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -458,7 +458,7 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
   /**
    * Set the query to be a delete query.
    */
-  void setupForDeleteOrUpdate(boolean deleteRequest);
+  void setupForDeleteOrUpdate();
 
   /**
    * Set the query to be delete by ids due to cascading delete.
@@ -788,7 +788,7 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
   /**
    * Set to true when we only include the Id property if it is explicitly included in the select().
    */
-  void setManualId(boolean manualId);
+  void setManualId();
 
   /**
    * Set default select clauses where none have been explicitly defined.

src/main/java/io/ebeaninternal/api/SpiTransaction.java

@@ -313,4 +313,9 @@ public interface SpiTransaction extends Transaction {
    * Return true when nested transactions should create Savepoints.
    */
   boolean isNestedUseSavepoint();
+
+  /**
+   * Return true if explicitly set to skip cache (ignores skipOnWrite).
+   */
+  boolean isSkipCacheExplicit();
 }

src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java

@@ -158,6 +158,11 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.setSkipCache(skipCache);
   }
 
+  @Override
+  public boolean isSkipCacheExplicit() {
+    return transaction.isSkipCacheExplicit();
+  }
+
   @Override
   public boolean isSkipCache() {
     return transaction.isSkipCache();
@@ -269,8 +274,8 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
-    transaction.setBatchGetGeneratedKeys(getGeneratedKeys);
+  public void setGetGeneratedKeys(boolean getGeneratedKeys) {
+    transaction.setGetGeneratedKeys(getGeneratedKeys);
   }
 
   @Override
@@ -279,18 +284,18 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
-    transaction.setBatchFlushOnMixed(batchFlushOnMixed);
+  public void setFlushOnMixed(boolean batchFlushOnMixed) {
+    transaction.setFlushOnMixed(batchFlushOnMixed);
   }
 
   @Override
-  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
-    transaction.setBatchFlushOnQuery(batchFlushOnQuery);
+  public void setFlushOnQuery(boolean batchFlushOnQuery) {
+    transaction.setFlushOnQuery(batchFlushOnQuery);
   }
 
   @Override
-  public boolean isBatchFlushOnQuery() {
-    return transaction.isBatchFlushOnQuery();
+  public boolean isFlushOnQuery() {
+    return transaction.isFlushOnQuery();
   }
 
   @Override

src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java

@@ -14,6 +14,8 @@ import io.ebean.config.dbplatform.cockroach.CockroachPlatform;
 import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.hana.HanaPlatform;
+import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
+import io.ebean.config.dbplatform.mariadb.MariaDbPlatform;
 import io.ebean.config.dbplatform.mysql.MySql55Platform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.nuodb.NuoDbPlatform;
@@ -813,10 +815,14 @@ public class DefaultDbMigration implements DbMigration {
     switch (platform) {
       case H2:
         return new H2Platform();
+      case HSQLDB:
+        return new HsqldbPlatform();
       case POSTGRES9:
         return new Postgres9Platform();
       case POSTGRES:
         return new PostgresPlatform();
+      case MARIADB:
+        return new MariaDbPlatform();
       case MYSQL55:
         return new MySql55Platform();
       case MYSQL:

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbDdl.java

@@ -0,0 +1,14 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+
+/**
+ * MariaDB platform DDL.
+ */
+public class MariaDbDdl extends MySqlDdl {
+
+  public MariaDbDdl(DatabasePlatform platform) {
+    super(platform);
+    this.historyDdl = new MariaDbHistoryDdl();
+  }
+}

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MariaDbHistoryDdl.java

@@ -0,0 +1,98 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.config.ServerConfig;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MTable;
+
+import java.io.IOException;
+
+/**
+ * History DDL for MariaDB.
+ */
+public class MariaDbHistoryDdl implements PlatformHistoryDdl {
+
+  private String systemPeriodStart;
+  private String systemPeriodEnd;
+  private PlatformDdl platformDdl;
+
+  @Override
+  public void configure(ServerConfig serverConfig, PlatformDdl platformDdl) {
+    this.systemPeriodStart = serverConfig.getAsOfSysPeriod() + "From";
+    this.systemPeriodEnd = serverConfig.getAsOfSysPeriod() + "To";
+    this.platformDdl = platformDdl;
+  }
+
+  @Override
+  public void createWithHistory(DdlWrite writer, MTable table) throws IOException {
+    String baseTable = table.getName();
+    enableSystemVersioning(writer, baseTable);
+  }
+
+  String getHistoryTable(String baseTable) {
+    String historyTable = baseTable + "_history";
+    if (baseTable.startsWith("[")) {
+      historyTable = historyTable.replace("]", "") + "]";
+    }
+    if (historyTable.indexOf('.') == -1) {
+      // history must contain schema, add the default schema if none was specified
+      historyTable = "dbo." + historyTable;
+    }
+    return historyTable;
+  }
+
+  private void enableSystemVersioning(DdlWrite writer, String baseTable) throws IOException {
+    DdlBuffer apply = writer.applyHistoryView();
+
+    final String systemTime = String.format("system_time(%s, %s),", systemPeriodStart, systemPeriodEnd);
+    apply.append("alter table ").append(baseTable).newLine()
+      .append("    add column ").append(systemPeriodStart).append(" timestamp(6) generated always as row start,").newLine()
+      .append("    add column ").append(systemPeriodEnd).append("   timestamp(6) generated always as row end,").newLine()
+      .append("    add period for ").append(systemTime).newLine()
+      .append("    add system versioning;").newLine();
+
+    DdlBuffer drop = writer.dropAll();
+    //drop.append("IF OBJECT_ID('").append(baseTable).append("', 'U') IS NOT NULL alter table ").append(baseTable).append(" set (system_versioning = off)").endOfStatement();
+    //drop.append("IF OBJECT_ID('").append(baseTable).append("_history', 'U') IS NOT NULL drop table ").append(baseTable).append("_history").endOfStatement();
+  }
+
+  @Override
+  public void dropHistoryTable(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException {
+    String baseTable = dropHistoryTable.getBaseTable();
+    DdlBuffer apply = writer.applyHistoryView();
+    apply.append("-- dropping history support for ").append(baseTable).endOfStatement();
+    // drop default constraints
+
+    apply.append(platformDdl.alterColumnDefaultValue(baseTable, systemPeriodStart, DdlHelp.DROP_DEFAULT)).endOfStatement();
+    apply.append(platformDdl.alterColumnDefaultValue(baseTable, systemPeriodEnd, DdlHelp.DROP_DEFAULT)).endOfStatement();
+    // switch of versioning & period
+    apply.append("alter table ").append(baseTable).append(" set (system_versioning = off)").endOfStatement();
+    apply.append("alter table ").append(baseTable).append(" drop period for system_time").endOfStatement();
+    // now drop tables & columns
+    apply.append("alter table ").append(baseTable).append(" drop column ").append(systemPeriodStart).endOfStatement();
+    apply.append("alter table ").append(baseTable).append(" drop column ").append(systemPeriodEnd).endOfStatement();
+    //apply.append("IF OBJECT_ID('").append(baseTable).append("_history', 'U') IS NOT NULL drop table ").append(baseTable).append("_history").endOfStatement();
+    apply.end();
+  }
+
+  @Override
+  public void addHistoryTable(DdlWrite writer, AddHistoryTable addHistoryTable) throws IOException {
+    String baseTable = addHistoryTable.getBaseTable();
+    enableSystemVersioning(writer, baseTable);
+  }
+
+  @Override
+  public void updateTriggers(DdlWrite writer, HistoryTableUpdate baseTable) throws IOException {
+    // SQL Server 2016 does not need triggers
+    DdlBuffer apply = writer.applyHistoryView();
+    String baseTableName = baseTable.getBaseTable();
+    apply.append("-- alter table ").append(baseTableName).append(" set (system_versioning = off (history_table=")
+      .append(getHistoryTable(baseTableName)).append("))").endOfStatement();
+    apply.append("-- history migration goes here").newLine();
+    apply.append("-- alter table ").append(baseTableName).append(" set (system_versioning = on (history_table=")
+      .append(getHistoryTable(baseTableName)).append("))").endOfStatement();
+
+  }
+}

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java

@@ -6,9 +6,9 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 /**
  * Oracle platform specific DDL.
  */
-public class Oracle10Ddl extends PlatformDdl {
+public class OracleDdl extends PlatformDdl {
 
-  public Oracle10Ddl(DatabasePlatform platform) {
+  public OracleDdl(DatabasePlatform platform) {
     super(platform);
     this.dropTableIfExists = "drop table ";
     this.dropSequenceIfExists = "drop sequence ";
@@ -48,4 +48,12 @@ public class Oracle10Ddl extends PlatformDdl {
     }
   }
 
+  /**
+   * Modify and return the column definition for autoincrement or identity definition.
+   */
+  @Override
+  public String asIdentityColumn(String columnDefn, DdlIdentity identity) {
+    return asIdentityStandardOptions(columnDefn, identity);
+  }
+
 }

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java

@@ -195,7 +195,6 @@ public class PlatformDdl {
    * SQl2003 standard identity definition.
    */
   protected String asIdentityStandardOptions(String columnDefn, DdlIdentity identity) {
-
     StringBuilder sb = new StringBuilder(columnDefn.length() + 60);
     sb.append(columnDefn).append(identity.optionGenerated());
     sb.append(identity.identityOptions(identityStartWith, identityIncrementBy, identityCache));

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java

@@ -58,7 +58,7 @@ public class PlatformTypeConverter {
       } else {
         // scale - varchar(10)
         int scale = Integer.parseInt(columnDefinition.substring(open + 1, close));
-        return dbType.renderType(scale, 0) + suffix;
+        return dbType.renderType(scale, -1) + suffix;
       }
 
     } catch (IllegalArgumentException e) {

src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java

@@ -15,7 +15,7 @@ import java.util.Objects;
  */
 public class MColumn {
 
-  private final String name;
+  private String name;
   private String type;
   private String checkConstraint;
   private String checkConstraintName;
@@ -88,7 +88,6 @@ public class MColumn {
    * Return a copy of this column used for creating the associated draft table.
    */
   public MColumn copyForDraft() {
-
     MColumn copy = new MColumn(name, type);
     copy.draftOnly = draftOnly;
     copy.checkConstraint = checkConstraint;
@@ -470,6 +469,14 @@ public class MColumn {
     this.dbMigrationInfos = dbMigrationInfos;
   }
 
+  /**
+   * Rename the column.
+   */
+  public MColumn rename(String newName) {
+    this.name = newName;
+    return this;
+  }
+
   /**
    * Apply changes based on the AlterColumn request.
    */

src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java

@@ -55,7 +55,7 @@ public class MCompoundUniqueConstraint {
   public MCompoundUniqueConstraint(AddUniqueConstraint change) {
     this.name = change.getConstraintName();
     this.columns = split(change.getColumnNames());
-    this.oneToOne = change.isOneToOne();
+    this.oneToOne = Boolean.TRUE.equals(change.isOneToOne());
     this.platforms = change.getPlatforms();
     this.nullableColumns = splitWithNull(change.getNullableColumns());
   }
@@ -63,7 +63,7 @@ public class MCompoundUniqueConstraint {
   public MCompoundUniqueConstraint(UniqueConstraint uq) {
     this.name = uq.getName();
     this.columns = split(uq.getColumnNames());
-    this.oneToOne = uq.isOneToOne();
+    this.oneToOne = Boolean.TRUE.equals(uq.isOneToOne());
     this.platforms = uq.getPlatforms();
     this.nullableColumns = splitWithNull(uq.getNullableColumns());
   }

src/main/java/io/ebeaninternal/dbmigration/model/MTable.java

@@ -11,6 +11,7 @@ import io.ebeaninternal.dbmigration.migration.DropColumn;
 import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.migration.DropTable;
 import io.ebeaninternal.dbmigration.migration.ForeignKey;
+import io.ebeaninternal.dbmigration.migration.RenameColumn;
 import io.ebeaninternal.dbmigration.migration.UniqueConstraint;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
@@ -415,6 +416,15 @@ public class MTable {
     }
   }
 
+  public void apply(RenameColumn renameColumn) {
+    checkTableName(renameColumn.getTableName());
+    MColumn column = columns.remove(renameColumn.getOldName());
+    if (column == null) {
+      throw new IllegalStateException("Column [" + renameColumn.getOldName() + "] does not exist for RenameColumn change on table [" + renameColumn.getTableName() + "]?");
+    }
+    addColumn(column.rename(renameColumn.getNewName()));
+  }
+
   public String getName() {
     return name;
   }

src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java

@@ -17,6 +17,7 @@ import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
 import io.ebeaninternal.dbmigration.migration.DropIndex;
 import io.ebeaninternal.dbmigration.migration.DropTable;
 import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migration.RenameColumn;
 import io.ebeaninternal.dbmigration.migration.Sql;
 
 import java.util.ArrayList;
@@ -163,6 +164,8 @@ public class ModelContainer {
         applyChange((AddColumn) change);
       } else if (change instanceof DropColumn) {
         applyChange((DropColumn) change);
+      } else if (change instanceof RenameColumn) {
+        applyChange((RenameColumn) change);
       } else if (change instanceof CreateIndex) {
         applyChange((CreateIndex) change);
       } else if (change instanceof DropIndex) {
@@ -314,6 +317,14 @@ public class ModelContainer {
     table.apply(dropColumn);
   }
 
+  protected void applyChange(RenameColumn renameColumn) {
+    MTable table = tables.get(renameColumn.getTableName());
+    if (table == null) {
+      throw new IllegalStateException("Table [" + renameColumn.getTableName() + "] does not exist in model?");
+    }
+    table.apply(renameColumn);
+  }
+
   /**
    * Add a table (typically from reading EbeanServer meta data).
    */

src/main/java/io/ebeaninternal/server/cache/CachedBeanId.java

@@ -0,0 +1,54 @@
+package io.ebeaninternal.server.cache;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+/**
+ * Bean Id value plus discriminator type.
+ * <p>
+ * Put into L2 cache such that we know the type of a bean with inheritance.
+ */
+public class CachedBeanId implements Externalizable {
+
+  private String discValue;
+  private Object id;
+
+  public CachedBeanId(String discValue, Object id) {
+    this.discValue = discValue;
+    this.id = id;
+  }
+
+  /**
+   * Construct from serialisation.
+   */
+  public CachedBeanId() {
+  }
+
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    out.writeUTF(discValue);
+    out.writeObject(id);
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    discValue = in.readUTF();
+    id = in.readObject();
+  }
+
+  @Override
+  public String toString() {
+    return discValue + ":" + id;
+  }
+
+  public String getDiscValue() {
+    return discValue;
+  }
+
+  public Object getId() {
+    return id;
+  }
+
+}

src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java

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

src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java

@@ -52,7 +52,7 @@ public class DefaultChangeLogRegister implements ChangeLogRegister {
    * Find and return the ChangeLog annotation in the inheritance hierarchy.
    */
   private ChangeLog getChangeLog(Class<?> beanType) {
-    return AnnotationUtil.findAnnotationRecursive(beanType, ChangeLog.class);
+    return AnnotationUtil.typeGet(beanType, ChangeLog.class);
   }
 
   /**

src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java

@@ -58,7 +58,7 @@ public abstract class AbstractSqlQueryRequest {
       trans = server.currentServerTransaction();
       if (trans == null || !trans.isActive()) {
         // create a local readOnly transaction
-        trans = server.createQueryTransaction(null);
+        trans = server.createReadOnlyTransaction(null);
         createdTransaction = true;
       }
     }

src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java

@@ -7,6 +7,8 @@ import io.ebean.config.dbplatform.cockroach.CockroachPlatform;
 import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.hana.HanaPlatform;
+import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
+import io.ebean.config.dbplatform.mariadb.MariaDbPlatform;
 import io.ebean.config.dbplatform.mysql.MySql55Platform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.nuodb.NuoDbPlatform;
@@ -75,11 +77,13 @@ public class DatabasePlatformFactory {
    * Lookup the platform by name.
    */
   private DatabasePlatform byDatabaseName(String dbName) {
-
     dbName = dbName.toLowerCase();
     if (dbName.equals("h2")) {
       return new H2Platform();
     }
+    if (dbName.equals("mariadb")) {
+      return new MariaDbPlatform();
+    }
     if (dbName.equals("mysql")) {
       return new MySqlPlatform();
     }
@@ -122,7 +126,6 @@ public class DatabasePlatformFactory {
     if (dbName.equals("hana")) {
       return new HanaPlatform();
     }
-
     throw new RuntimeException("database platform " + dbName + " is not known?");
   }
 
@@ -159,12 +162,16 @@ public class DatabasePlatformFactory {
       return new OraclePlatform();
     } else if (dbProductName.contains("microsoft")) {
       throw new IllegalArgumentException("For SqlServer please explicitly choose either sqlserver16 or sqlserver17 as the platform via ServerConfig.setDatabasePlatformName. Refer to issue #1340 for more details");
-    } else if (dbProductName.contains("mysql")) {
-      return mysqlVersion(majorVersion, minorVersion);
     } else if (dbProductName.contains("h2")) {
       return new H2Platform();
+    } else if (dbProductName.contains("hsql database engine")) {
+      return new HsqldbPlatform();
     } else if (dbProductName.contains("postgres")) {
       return readPostgres(connection, majorVersion);
+    } else if (dbProductName.contains("mariadb")) {
+      return new MariaDbPlatform();
+    } else if (dbProductName.contains("mysql")) {
+      return mysqlVersion(majorVersion, minorVersion);
     } else if (dbProductName.contains("nuo")) {
       return new NuoDbPlatform();
     } else if (dbProductName.contains("sqlite")) {

src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java

@@ -33,7 +33,6 @@ public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
   @Override
   public void execute(Runnable r) {
     final Map<String, String> map = MDC.getCopyOfContextMap();
-
     if (map == null) {
       pool.execute(r);
     } else {
@@ -50,10 +49,14 @@ public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
 
   @Override
   public void executePeriodically(Runnable r, long delay, TimeUnit unit) {
-    final Map<String, String> map = MDC.getCopyOfContextMap();
+    executePeriodically(r, delay, delay, unit);
+  }
 
+  @Override
+  public void executePeriodically(Runnable r, long initialDelay, long delay, TimeUnit unit) {
+    final Map<String, String> map = MDC.getCopyOfContextMap();
     if (map == null) {
-      schedulePool.scheduleWithFixedDelay(r, delay, delay, unit);
+      schedulePool.scheduleWithFixedDelay(r, initialDelay, delay, unit);
     } else {
       schedulePool.scheduleWithFixedDelay(() -> {
         MDC.setContextMap(map);
@@ -62,14 +65,13 @@ public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
         } finally {
           MDC.clear();
         }
-      }, delay, delay, unit);
+      }, initialDelay, delay, unit);
     }
   }
 
   @Override
   public ScheduledFuture<?> schedule(Runnable r, long delay, TimeUnit unit) {
     final Map<String, String> map = MDC.getCopyOfContextMap();
-
     if (map == null) {
       return schedulePool.schedule(r, delay, unit);
     } else {
@@ -87,7 +89,6 @@ public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
   @Override
   public <V> ScheduledFuture<V> schedule(Callable<V> c, long delay, TimeUnit unit) {
     final Map<String, String> map = MDC.getCopyOfContextMap();
-
     if (map == null) {
       return schedulePool.schedule(c, delay, unit);
     } else {

src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java

@@ -170,7 +170,7 @@ class DefaultBeanLoader {
   private List<?> executeQuery(LoadRequest loadRequest, SpiQuery<?> query) {
     if (onIterateUseExtraTxn && loadRequest.isParentFindIterate()) {
       // MySql - we need a different transaction to execute the secondary query
-      SpiTransaction extraTxn = server.createQueryTransaction(query.getTenantId());
+      SpiTransaction extraTxn = server.createReadOnlyTransaction(query.getTenantId());
       try {
         return server.findList(query, extraTxn);
       } finally {

src/main/java/io/ebeaninternal/server/core/DefaultContainer.java

@@ -8,10 +8,6 @@ import io.ebean.config.TenantMode;
 import io.ebean.config.UnderscoreNamingConvention;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
-import io.ebean.datasource.DataSourceAlertFactory;
-import io.ebean.datasource.DataSourceConfig;
-import io.ebean.datasource.DataSourceFactory;
-import io.ebean.datasource.DataSourcePoolListener;
 import io.ebean.service.SpiContainer;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -24,7 +20,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
-import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -39,13 +34,8 @@ public class DefaultContainer implements SpiContainer {
 
   private final ClusterManager clusterManager;
 
-  private final JndiDataSourceLookup jndiDataSourceFactory;
-
   public DefaultContainer(ContainerConfig containerConfig) {
-
     this.clusterManager = new ClusterManager(containerConfig);
-    this.jndiDataSourceFactory = new JndiDataSourceLookup();
-
     // register so that we can shutdown any Ebean wide
     // resources such as clustering
     ShutdownManager.registerContainer(this);
@@ -230,75 +220,10 @@ public class DefaultContainer implements SpiContainer {
    * Set the DataSource if it has not already been set.
    */
   private void setDataSource(ServerConfig config) {
-    if (config.getDataSource() == null) {
-      config.setDataSource(getDataSourceFromConfig(config, false));
-    }
-    if (config.getReadOnlyDataSource() == null && config.isAutoReadOnlyDataSource()) {
-      config.setReadOnlyDataSource(getDataSourceFromConfig(config, true));
-    }
-  }
-
-  private DataSource getDataSourceFromConfig(ServerConfig config, boolean readOnly) {
-
     if (isOfflineMode(config)) {
       logger.debug("... DbOffline using platform [{}]", DbOffline.getPlatform());
-      return null;
-    }
-
-    if (!readOnly && config.getDataSourceJndiName() != null) {
-      DataSource ds = jndiDataSourceFactory.lookup(config.getDataSourceJndiName());
-      if (ds == null) {
-        throw new PersistenceException("JNDI lookup for DataSource " + config.getDataSourceJndiName() + " returned null.");
-      } else {
-        return ds;
-      }
-    }
-
-    DataSourceConfig dsConfig = (readOnly) ? config.getReadOnlyDataSourceConfig() : config.getDataSourceConfig();
-    if (dsConfig == null) {
-      throw new PersistenceException("No DataSourceConfig defined for " + config.getName());
-    }
-
-    if (dsConfig.isOffline()) {
-      if (config.getDatabasePlatformName() == null) {
-        throw new PersistenceException("You MUST specify a DatabasePlatformName on ServerConfig when offline");
-      }
-      return null;
-    }
-
-    DataSourceFactory factory = DataSourceFactory.get();
-    if (factory == null) {
-      throw new IllegalStateException("No DataSourceFactory service implementation found in class path."
-        + " Probably missing dependency to avaje-datasource?");
-    }
-
-    DataSourceAlertFactory alertFactory = config.service(DataSourceAlertFactory.class);
-    if (alertFactory != null) {
-      dsConfig.setAlert(alertFactory.createAlert());
-    }
-
-    attachListener(config, dsConfig);
-
-    if (readOnly) {
-      // setup to use AutoCommit such that we skip explicit commit
-      dsConfig.setAutoCommit(true);
-      //dsConfig.setReadOnly(true);
-      dsConfig.setDefaults(config.getDataSourceConfig());
-      dsConfig.setIsolationLevel(config.getDataSourceConfig().getIsolationLevel());
-    }
-    String poolName = config.getName() + (readOnly ? "-ro" : "");
-    return factory.createPool(poolName, dsConfig);
-  }
-
-  /**
-   * Create and attach a DataSourcePoolListener if it has been specified via properties and there is not one already attached.
-   */
-  private void attachListener(ServerConfig config, DataSourceConfig dsConfig) {
-    if (dsConfig.getListener() == null) {
-      String poolListener = dsConfig.getPoolListener();
-      if (poolListener != null) {
-        dsConfig.setListener((DataSourcePoolListener) config.getClassLoadConfig().newInstance(poolListener));
-      }
+    } else {
+      InitDataSource.init(config);
     }
   }
 
@@ -331,7 +256,7 @@ public class DefaultContainer implements SpiContainer {
     }
 
     try (Connection connection = serverConfig.getDataSource().getConnection()) {
-      if (!serverConfig.isAutoCommitMode() && connection.getAutoCommit()) {
+      if (connection.getAutoCommit()) {
         logger.warn("DataSource [{}] has autoCommit defaulting to true!", serverConfig.getName());
       }
       return true;

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

@@ -1507,19 +1507,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction) {
-    return findStreamWithSingleContext(false, query, transaction);
+    return findStream(query, transaction);
   }
 
   @Override
   public <T> Stream<T> findStream(Query<T> query, Transaction transaction) {
-    return findStreamWithSingleContext(true, query, transaction);
-  }
-
-  private <T> Stream<T> findStreamWithSingleContext(boolean singleContext, Query<T> query, Transaction transaction) {
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, transaction);
-    if (singleContext) {
-      request.setIterateSingleContext();
-    }
     try {
       request.initTransIfRequired();
       return toStream(request.findIterate());
@@ -2322,8 +2315,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public SpiTransaction createQueryTransaction(Object tenantId) {
-    return transactionManager.createQueryTransaction(tenantId);
+  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
+    return transactionManager.createReadOnlyTransaction(tenantId);
   }
 
   /**

src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java

@@ -47,7 +47,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
     SpiQuery<?> ormQuery = query.getOrmQuery();
     if (ormQuery != null) {
       ormQuery.setType(type);
-      ormQuery.setManualId(true);
+      ormQuery.setManualId();
 
       // execute the underlying ORM query returning the ResultSet
       SpiResultSet result = server.findResultSet(ormQuery, trans);
@@ -102,7 +102,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
   @SuppressWarnings("unchecked")
   public T readNextBean() throws SQLException {
     dataReader.resetColumnPosition();
-    return (T)plan.readRow(dataReader);
+    return (T) plan.readRow(dataReader);
   }
 
   private DtoMappingRequest mappingRequest() throws SQLException {
@@ -110,19 +110,29 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
   }
 
   private DtoColumn[] readMeta() throws SQLException {
-
     ResultSetMetaData metaData = resultSet.getMetaData();
     int cols = metaData.getColumnCount();
     DtoColumn[] meta = new DtoColumn[cols];
     for (int i = 0; i < cols; i++) {
-      int pos = i+1;
+      int pos = i + 1;
       String columnLabel = metaData.getColumnLabel(pos);
       if (columnLabel == null) {
         columnLabel = metaData.getColumnName(pos);
       }
-      meta[i] = new DtoColumn(columnLabel);
+      meta[i] = new DtoColumn(parseColumn(columnLabel));
     }
     return meta;
   }
 
+  static String parseColumn(String columnLabel) {
+    if (columnLabel.startsWith("_e_") || columnLabel.startsWith("_E_")) {
+      // encrypted column alias in the form _e_<tableAlias>_<column>
+      final int pos = columnLabel.indexOf("_", 3);
+      if (pos > -1) {
+        return columnLabel.substring(pos + 1);
+      }
+    }
+    return columnLabel;
+  }
+
 }

src/main/java/io/ebeaninternal/server/core/InitDataSource.java

@@ -0,0 +1,145 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.config.ServerConfig;
+import io.ebean.datasource.DataSourceAlertFactory;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceFactory;
+import io.ebean.datasource.DataSourcePoolListener;
+
+import javax.persistence.PersistenceException;
+import javax.sql.DataSource;
+
+/**
+ * Initialise the main DataSource and read-only DataSource.
+ */
+class InitDataSource {
+
+  private final JndiDataSourceLookup jndiDataSourceFactory = new JndiDataSourceLookup();
+
+  private final ServerConfig config;
+
+  /**
+   * Create and set the main DataSource and read-only DataSource.
+   */
+  static void init(ServerConfig config) {
+    new InitDataSource(config).initialise();
+  }
+
+  InitDataSource(ServerConfig config) {
+    this.config = config;
+  }
+
+  private void initialise() {
+    if (config.getDataSource() == null) {
+      config.setDataSource(initDataSource());
+    }
+    if (config.getReadOnlyDataSource() == null) {
+      config.setReadOnlyDataSource(initReadOnlyDataSource());
+    }
+  }
+
+  /**
+   * Initialise the "main" read write DataSource from configuration.
+   */
+  private DataSource initDataSource() {
+    final String jndiName = config.getDataSourceJndiName();
+    if (jndiName != null) {
+      return jndiDataSource(jndiName);
+    }
+    return createFromConfig(config.getDataSourceConfig(), false);
+  }
+
+  private DataSource jndiDataSource(String jndiName) {
+    DataSource ds = jndiDataSourceFactory.lookup(jndiName);
+    if (ds == null) {
+      throw new PersistenceException("JNDI lookup for DataSource " + jndiName + " returned null.");
+    }
+    return ds;
+  }
+
+  /**
+   * Initialise the "read only" DataSource from configuration.
+   */
+  private DataSource initReadOnlyDataSource() {
+    DataSourceConfig roConfig = readOnlyConfig();
+    return roConfig == null ? null : createFromConfig(roConfig, true);
+  }
+
+  DataSourceConfig readOnlyConfig() {
+    DataSourceConfig roConfig = config.getReadOnlyDataSourceConfig();
+    if (roConfig == null) {
+      // it has explicitly been set to null, not expected but ok
+      return null;
+    }
+    if (urlSet(roConfig.getUrl())) {
+      return roConfig;
+    }
+    // convenient alternate place to set the read-only url
+    final String readOnlyUrl = config.getDataSourceConfig().getReadOnlyUrl();
+    if (urlSet(readOnlyUrl)) {
+      roConfig.setUrl(readOnlyUrl);
+      return roConfig;
+    }
+    if (config.isAutoReadOnlyDataSource()) {
+      roConfig.setUrl(null); // blank out in case it is "none"
+      return roConfig;
+    } else {
+      return null;
+    }
+  }
+
+  private boolean urlSet(String url) {
+    return url != null && !"none".equalsIgnoreCase(url) && !url.trim().isEmpty();
+  }
+
+  private DataSource createFromConfig(DataSourceConfig dsConfig, boolean readOnly) {
+    if (dsConfig == null) {
+      throw new PersistenceException("No DataSourceConfig defined for " + config.getName());
+    }
+    if (dsConfig.isOffline()) {
+      if (config.getDatabasePlatformName() == null) {
+        throw new PersistenceException("You MUST specify a DatabasePlatformName on ServerConfig when offline");
+      }
+      return null;
+    }
+
+    attachAlert(dsConfig);
+    attachListener(dsConfig);
+
+    if (readOnly) {
+      // setup to use AutoCommit such that we skip explicit commit
+      dsConfig.setAutoCommit(true);
+      dsConfig.setReadOnly(true);
+      dsConfig.setDefaults(config.getDataSourceConfig());
+      dsConfig.setIsolationLevel(config.getDataSourceConfig().getIsolationLevel());
+    }
+    return create(dsConfig, readOnly);
+  }
+
+  private DataSource create(DataSourceConfig dsConfig, boolean readOnly) {
+    String poolName = config.getName() + (readOnly ? "-ro" : "");
+    return DataSourceFactory.create(poolName, dsConfig);
+  }
+
+  /**
+   * Attach DataSourceAlert via service loader if present.
+   */
+  private void attachAlert(DataSourceConfig dsConfig) {
+    DataSourceAlertFactory alertFactory = config.service(DataSourceAlertFactory.class);
+    if (alertFactory != null) {
+      dsConfig.setAlert(alertFactory.createAlert());
+    }
+  }
+
+  /**
+   * Create and attach a DataSourcePoolListener if it has been specified via properties and there is not one already attached.
+   */
+  private void attachListener(DataSourceConfig dsConfig) {
+    if (dsConfig.getListener() == null) {
+      String poolListener = dsConfig.getPoolListener();
+      if (poolListener != null) {
+        dsConfig.setListener((DataSourcePoolListener) config.getClassLoadConfig().newInstance(poolListener));
+      }
+    }
+  }
+}

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

@@ -15,7 +15,6 @@ import io.ebean.config.ServerConfig;
 import io.ebean.config.SlowQueryListener;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbHistorySupport;
-import io.ebean.datasource.DataSourcePool;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
@@ -45,10 +44,10 @@ import io.ebeaninternal.server.changelog.DefaultChangeLogPrepare;
 import io.ebeaninternal.server.changelog.DefaultChangeLogRegister;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
-import io.ebeaninternal.server.core.timezone.CloneDataTimeZone;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
-import io.ebeaninternal.server.core.timezone.LocalDataTimeZone;
+import io.ebeaninternal.server.core.timezone.MySqlDataTimeZone;
 import io.ebeaninternal.server.core.timezone.NoDataTimeZone;
+import io.ebeaninternal.server.core.timezone.OracleDataTimeZone;
 import io.ebeaninternal.server.core.timezone.SimpleDataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
@@ -78,12 +77,10 @@ import io.ebeaninternal.server.query.QueryPlanLoggerSqlServer;
 import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger;
 import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare;
 import io.ebeaninternal.server.text.json.DJsonContext;
-import io.ebeaninternal.server.transaction.AutoCommitTransactionManager;
 import io.ebeaninternal.server.transaction.DataSourceSupplier;
 import io.ebeaninternal.server.transaction.DefaultProfileHandler;
 import io.ebeaninternal.server.transaction.DefaultTransactionScopeManager;
 import io.ebeaninternal.server.transaction.DocStoreTransactionManager;
-import io.ebeaninternal.server.transaction.ExplicitTransactionManager;
 import io.ebeaninternal.server.transaction.ExternalTransactionScopeManager;
 import io.ebeaninternal.server.transaction.JtaTransactionManager;
 import io.ebeaninternal.server.transaction.NoopProfileHandler;
@@ -100,7 +97,6 @@ import io.ebeanservice.docstore.none.NoneDocStoreFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.sql.DataSource;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -450,12 +446,6 @@ public class InternalConfiguration {
         indexUpdateProcessor, beanDescriptorManager, dataSource(), profileHandler(), logManager,
         tableModState, cacheNotify, clockService);
 
-    if (serverConfig.isExplicitTransactionBeginMode()) {
-      return new ExplicitTransactionManager(options);
-    }
-    if (isAutoCommitMode()) {
-      return new AutoCommitTransactionManager(options);
-    }
     if (serverConfig.isDocStoreOnly()) {
       return new DocStoreTransactionManager(options);
     }
@@ -492,18 +482,6 @@ public class InternalConfiguration {
     }
   }
 
-  /**
-   * Return true if autoCommit mode is on.
-   */
-  private boolean isAutoCommitMode() {
-    if (serverConfig.isAutoCommitMode()) {
-      // explicitly set
-      return true;
-    }
-    DataSource dataSource = serverConfig.getDataSource();
-    return dataSource instanceof DataSourcePool && ((DataSourcePool) dataSource).isAutoCommit();
-  }
-
   /**
    * Create the TransactionScopeManager taking into account JTA or external transaction manager.
    */
@@ -525,23 +503,22 @@ public class InternalConfiguration {
    * Create the DataTimeZone implementation to use.
    */
   private DataTimeZone initDataTimeZone() {
-
     String tz = serverConfig.getDataTimeZone();
     if (tz == null) {
-      if (isMySql(getPlatform())) {
-        return new LocalDataTimeZone();
+      if (isMySqlOrMariaDB(getPlatform())) {
+        return new MySqlDataTimeZone();
       }
       return new NoDataTimeZone();
     }
     if (getPlatform().base() == Platform.ORACLE) {
-      return new CloneDataTimeZone(tz);
+      return new OracleDataTimeZone(tz);
     } else {
       return new SimpleDataTimeZone(tz);
     }
   }
 
-  private boolean isMySql(Platform platform) {
-    return platform.base() == Platform.MYSQL;
+  private boolean isMySqlOrMariaDB(Platform platform) {
+    return platform.base() == Platform.MYSQL || platform.base() == Platform.MARIADB;
   }
 
   public DataTimeZone getDataTimeZone() {
@@ -594,7 +571,10 @@ public class InternalConfiguration {
   }
 
   private ServerCachePlugin initServerCachePlugin() {
-
+    if (serverConfig.isLocalOnlyL2Cache()) {
+      localL2Caching = true;
+      return new DefaultServerCachePlugin();
+    }
     ServerCachePlugin plugin = serverConfig.getServerCachePlugin();
     if (plugin == null) {
       ServiceLoader<ServerCachePlugin> cacheFactories = ServiceLoader.load(ServerCachePlugin.class);

src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java

@@ -57,14 +57,14 @@ public class MultiTenantDbCatalogSupplier implements DataSourceSupplier {
   @Override
   public void shutdown(boolean deregisterDriver) {
     if (readOnlyDataSource instanceof DataSourcePool) {
-      ((DataSourcePool) readOnlyDataSource).shutdown(false);
+      ((DataSourcePool) readOnlyDataSource).shutdown();
     }
     if (dataSource instanceof DataSourcePool) {
-      ((DataSourcePool) dataSource).shutdown(deregisterDriver);
+      ((DataSourcePool) dataSource).shutdown();
     }
   }
 
-  private class CatalogDataSource implements DataSource {
+  private static class CatalogDataSource implements DataSource {
 
     final DataSource dataSource;
     final CurrentTenantProvider tenantProvider;

src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java

@@ -57,10 +57,10 @@ class MultiTenantDbSchemaSupplier implements DataSourceSupplier {
   @Override
   public void shutdown(boolean deregisterDriver) {
     if (readOnlyDataSource instanceof DataSourcePool) {
-      ((DataSourcePool) readOnlyDataSource).shutdown(false);
+      ((DataSourcePool) readOnlyDataSource).shutdown();
     }
     if (dataSource instanceof DataSourcePool) {
-      ((DataSourcePool) dataSource).shutdown(deregisterDriver);
+      ((DataSourcePool) dataSource).shutdown();
     }
   }
 

src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java

@@ -89,8 +89,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
 
   private Set<String> dependentTables;
 
-  private boolean iterateSingleContext;
-
   /**
    * Create the InternalQueryRequest.
    */
@@ -108,15 +106,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return queryEngine.translate(this, bindLog, sql, e);
   }
 
-  @Override
-  public void setIterateSingleContext() {
-    this.iterateSingleContext = true;
-  }
-
-  public boolean isIterateSingleContext() {
-    return iterateSingleContext;
-  }
-
   @Override
   public boolean isDeleteByStatement() {
     if (!transaction.isPersistCascade() || beanDescriptor.isDeleteByStatement()) {
@@ -286,7 +275,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
       } else {
         // create an implicit transaction to execute this query
         // potentially using read-only DataSource with autoCommit
-        transaction = ebeanServer.createQueryTransaction(query.getTenantId());
+        transaction = ebeanServer.createReadOnlyTransaction(query.getTenantId());
       }
       createdTransaction = true;
     }
@@ -316,7 +305,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    */
   @Override
   public JsonReadOptions createJsonReadOptions() {
-
     persistenceContext = getPersistenceContext(query, transaction);
     if (query.getPersistenceContext() == null) {
       query.setPersistenceContext(persistenceContext);
@@ -327,7 +315,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
       loadContext = new DLoadContext(this, secondaryQueries);
       jsonRead.setLoadContext(loadContext);
     }
-
     return jsonRead;
   }
 
@@ -335,8 +322,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    * For iterate queries reset the persistenceContext and loadContext.
    */
   public void flushPersistenceContextOnIterate() {
-    if (!iterateSingleContext) {
-      persistenceContext = new DefaultPersistenceContext();
+    if (persistenceContext.resetLimit()) {
+      persistenceContext = persistenceContext.forIterateReset();
       loadContext.resetPersistenceContext(persistenceContext);
       if (jsonRead != null) {
         jsonRead.setPersistenceContext(persistenceContext);
@@ -350,7 +337,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    * transaction scoped.
    */
   private PersistenceContext getPersistenceContext(SpiQuery<?> query, SpiTransaction t) {
-
     // check if there is already a persistence context set which is the case
     // when lazy loading or query joins are executed
     PersistenceContext ctx = query.getPersistenceContext();
@@ -358,7 +344,14 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
 
     // determine the scope (from the query and then server)
     PersistenceContextScope scope = ebeanServer.getPersistenceContextScope(query);
-    return (scope == PersistenceContextScope.QUERY || t == null) ? new DefaultPersistenceContext() : t.getPersistenceContext();
+    if (scope == PersistenceContextScope.QUERY || t == null) {
+      return new DefaultPersistenceContext();
+    }
+    if (Type.ITERATE == query.getType()) {
+      return t.getPersistenceContext().forIterate();
+    } else {
+      return t.getPersistenceContext();
+    }
   }
 
   /**
@@ -578,6 +571,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return cacheKey != null && query.getUseQueryCache().isPut();
   }
 
+  public boolean isBeanCachePutMany() {
+    return !transaction.isSkipCacheExplicit() && query.isBeanCachePut();
+  }
+
   public boolean isBeanCachePut() {
     return !transaction.isSkipCache() && query.isBeanCachePut();
   }
@@ -586,7 +583,6 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    * Merge in prior L2 bean cache hits with the query result.
    */
   public void mergeCacheHits(BeanCollection<T> result) {
-
     if (cacheBeans != null && !cacheBeans.isEmpty()) {
       if (query.getType() == Type.MAP) {
         mergeCacheHitsToMap(result);

src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java

@@ -699,7 +699,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * Create and return a new reference bean matching this beans Id value.
    */
   public T createReference() {
-    return beanDescriptor.createReference(getBeanId(), null);
+    return beanDescriptor.createRef(getBeanId(), null);
   }
 
   /**
@@ -1399,7 +1399,8 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
               changes.put(property.getName(), val);
               if (property.isNaturalKey()) {
                 updateNaturalKey = true;
-                changeSet.addNaturalKeyPut(beanDescriptor, key, val.toString());
+                String valStr = (val == null) ? null : val.toString();
+                changeSet.addNaturalKeyPut(beanDescriptor, key, valStr);
               }
             }
           }

src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java

@@ -7,9 +7,10 @@ import io.ebeaninternal.dbmigration.ddlgeneration.platform.DB2Ddl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.H2Ddl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.HanaColumnStoreDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.HsqldbDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.MariaDbDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.MySqlDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.NuoDbDdl;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.Oracle10Ddl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.OracleDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.Postgres9Ddl;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.PostgresDdl;
@@ -31,6 +32,8 @@ public class PlatformDdlBuilder {
         return new H2Ddl(platform);
       case DB2:
         return new DB2Ddl(platform);
+      case MARIADB:
+        return new MariaDbDdl(platform);
       case MYSQL55:
       case MYSQL:
         return new MySqlDdl(platform);
@@ -40,7 +43,7 @@ public class PlatformDdlBuilder {
         return new NuoDbDdl(platform);
       case ORACLE:
       case ORACLE11:
-        return new Oracle10Ddl(platform);
+        return new OracleDdl(platform);
       case SQLITE:
         return new SQLiteDdl(platform);
       case POSTGRES9:

src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java

@@ -44,10 +44,10 @@ class SimpleDataSourceProvider implements DataSourceSupplier {
   @Override
   public void shutdown(boolean deregisterDriver) {
     if (readOnlyDataSource instanceof DataSourcePool){
-      ((DataSourcePool) readOnlyDataSource).shutdown(false);
+      ((DataSourcePool) readOnlyDataSource).shutdown();
     }
     if (dataSource instanceof DataSourcePool){
-      ((DataSourcePool) dataSource).shutdown(deregisterDriver);
+      ((DataSourcePool) dataSource).shutdown();
     }
   }
 }

src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java

@@ -177,9 +177,4 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequ
    */
   boolean isDeleteByStatement();
 
-  /**
-   * Set when we want to use a single persistence context for all beans returned
-   * in the query (so all beans are held in memory)
-   */
-  void setIterateSingleContext();
 }

src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java

@@ -473,6 +473,6 @@ public class BootupClasses implements ClassFilter {
    * Returns true if this class has the annotation (or meta annotation). Does not search recursively.
    */
   private boolean has(Class<?> cls, Class<? extends Annotation> ann) {
-    return AnnotationUtil.findAnnotation(cls, ann) != null;
+    return AnnotationUtil.has(cls, ann);
   }
 }

src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java

@@ -5,11 +5,11 @@ import java.util.Calendar;
 /**
  * Implementation of DataTimeZone when single Calendar instance is used with local timezone.
  */
-public class LocalDataTimeZone implements DataTimeZone {
+public class MySqlDataTimeZone implements DataTimeZone {
 
   protected final Calendar zone;
 
-  public LocalDataTimeZone() {
+  public MySqlDataTimeZone() {
     this.zone = Calendar.getInstance();
   }
 
@@ -19,7 +19,7 @@ public class LocalDataTimeZone implements DataTimeZone {
   }
 
   @Override
-    public Calendar getDateTimeZone() {
-      return zone; // workaround for MySQL. TODO: rename class to MySqlDataTimeZone!?
-    }
+  public Calendar getDateTimeZone() {
+    return zone;
+  }
 }

src/main/java/io/ebeaninternal/server/core/timezone/OracleDataTimeZone.java

@@ -8,9 +8,9 @@ import java.util.Calendar;
  * Used with Oracle JDBC driver as that wants to mutate the Calender.
  * </p>
  */
-public class CloneDataTimeZone extends SimpleDataTimeZone {
+public class OracleDataTimeZone extends SimpleDataTimeZone {
 
-  public CloneDataTimeZone(String zoneId) {
+  public OracleDataTimeZone(String zoneId) {
     super(zoneId);
   }
 

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -2053,14 +2053,16 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Create a non read only reference bean without checking cacheSharableBeans.
    */
-  @SuppressWarnings("unchecked")
   public T createReference(Object id, PersistenceContext pc) {
+    if (inheritInfo != null && !inheritInfo.isConcrete()) {
+      return findReferenceBean(id, pc);
+    }
+    return createRef(id, pc);
+  }
 
+  @SuppressWarnings("unchecked")
+  public T createRef(Object id, PersistenceContext pc) {
     try {
-      if (inheritInfo != null && !inheritInfo.isConcrete()) {
-        return findReferenceBean(id, pc);
-      }
-
       EntityBean eb = createEntityBean();
       id = convertSetId(id, eb);
       EntityBeanIntercept ebi = eb._ebean_getIntercept();
@@ -2071,7 +2073,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
         ebi.setPersistenceContext(pc);
       }
       return (T) eb;
-
     } catch (Exception ex) {
       throw new PersistenceException(ex);
     }

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -44,9 +44,9 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.meta.DeployBeanTable;
+import io.ebeaninternal.server.deploy.meta.DeployIdentityMode;
 import io.ebeaninternal.server.deploy.meta.DeployOrderColumn;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
-import io.ebeaninternal.server.deploy.meta.DeployIdentityMode;
 import io.ebeaninternal.server.deploy.parse.DeployBeanInfo;
 import io.ebeaninternal.server.deploy.parse.DeployCreateProperties;
 import io.ebeaninternal.server.deploy.parse.DeployInherit;
@@ -245,7 +245,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Run periodic trim of query plans.
    */
   public void scheduleBackgroundTrim() {
-    backgroundExecutor.executePeriodically(this::trimQueryPlans, 60L, TimeUnit.SECONDS);
+    backgroundExecutor.executePeriodically(this::trimQueryPlans, 117L, 60L, TimeUnit.SECONDS);
   }
 
   private void trimQueryPlans() {
@@ -357,7 +357,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Deploy returning the asOfTableMap (which is required by the SQL builders).
    */
   public Map<String, String> deploy(List<XmEbean> mappings) {
-
     try {
       createListeners();
       readEntityDeploymentInitial();
@@ -365,7 +364,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       readEntityBeanTable();
       readEntityDeploymentAssociations();
       readInheritedIdGenerators();
-      setProfileIds();
       // creates the BeanDescriptors
       readEntityRelationships();
 
@@ -375,9 +373,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
       initialiseAll();
       readForeignKeys();
-
       readTableToDescriptor();
-
       logStatus();
 
       // clear collections we no longer need
@@ -778,18 +774,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     }
   }
 
-  /**
-   * Set profileIds based on descriptor full name order.
-   */
-  private void setProfileIds() {
-
-    List<? extends DeployBeanDescriptor<?>> deployDescriptors = deployInfoMap.values().stream()
-      .map(DeployBeanInfo::getDescriptor)
-      .collect(Collectors.toList());
-
-    deployDescriptors.sort(Comparator.comparing(DeployBeanDescriptor::getFullName));
-  }
-
   /**
    * Create the BeanTable from the deployment information gathered so far.
    */
@@ -1002,6 +986,15 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     orderProperty.setDbInsertable(orderColumn.isInsertable());
     orderProperty.setDbUpdateable(orderColumn.isUpdatable());
     orderProperty.setDbRead(true);
+    orderProperty.setOwningType(targetDesc.getBeanType());
+
+    final InheritInfo targetInheritInfo = targetDesc.getInheritInfo();
+    if (targetInheritInfo != null) {
+      for (InheritInfo child : targetInheritInfo.getChildren()) {
+        final DeployBeanDescriptor<?> childDescriptor = deployInfoMap.get(child.getType()).getDescriptor();
+        childDescriptor.setOrderColumn(orderProperty);
+      }
+    }
 
     targetDesc.setOrderColumn(orderProperty);
   }
@@ -1401,13 +1394,13 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
         String primaryKeyColumn = desc.getSinglePrimaryKeyColumn();
         seqName = namingConvention.getSequenceName(desc.getBaseTable(), primaryKeyColumn);
       }
-      int increment = desc.setIdentitySequenceDefaultIncrement();
-      desc.setIdGenerator(createSequenceIdGenerator(seqName, increment));
+      int stepSize = desc.setIdentitySequenceBatchMode(databasePlatform.isSequenceBatchMode());
+      desc.setIdGenerator(createSequenceIdGenerator(seqName, stepSize));
     }
   }
 
-  private PlatformIdGenerator createSequenceIdGenerator(String seqName, int increment) {
-    return databasePlatform.createSequenceIdGenerator(backgroundExecutor, dataSource, increment, seqName);
+  private PlatformIdGenerator createSequenceIdGenerator(String seqName, int stepSize) {
+    return databasePlatform.createSequenceIdGenerator(backgroundExecutor, dataSource, stepSize, seqName);
   }
 
   private void createByteCode(DeployBeanDescriptor<?> deploy) {
@@ -1591,7 +1584,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    */
   private boolean isMappedSuperWithNoProperties(Class<?> beanClass) {
     // do not search recursive here
-    MappedSuperclass annotation = AnnotationUtil.findAnnotation(beanClass, MappedSuperclass.class);
+    MappedSuperclass annotation = AnnotationUtil.get(beanClass, MappedSuperclass.class);
     if (annotation == null) {
       return false;
     }

src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java

@@ -542,12 +542,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return dbEncryptFunction.getDecryptSql(propertyName);
   }
 
-  public String getDecryptSql() {
-    return dbEncryptFunction.getDecryptSql(this.getDbColumn());
-  }
-
-  private String getDecryptSql(String tableAlias) {
-    return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.getDbColumn());
+  /**
+   * Return the SQL for the column including decryption function and column alias.
+   */
+  private String getDecryptSqlWithColumnAlias(String tableAlias) {
+    return dbEncryptFunction.getDecryptSql(tableAlias + "." + this.getDbColumn()) + " _e_" + tableAlias + "_" + this.getDbColumn();
   }
 
   @Override
@@ -600,8 +599,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
       }
 
       if (dbEncrypted) {
-        String decryptSql = getDecryptSql(ctx.peekTableAlias());
-        ctx.appendRawColumn(decryptSql);
+        ctx.appendRawColumn(getDecryptSqlWithColumnAlias(ctx.peekTableAlias()));
         ctx.addEncryptedProp(this);
 
       } else {

src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -13,6 +13,7 @@ import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cache.CachedBeanData;
+import io.ebeaninternal.server.cache.CachedBeanId;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
@@ -433,11 +434,19 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
     if (embedded) {
       return targetDescriptor.cacheEmbeddedBeanExtract((EntityBean) ap);
+    } else if (targetInheritInfo != null) {
+      return createCacheBeanId(ap);
     } else {
       return targetDescriptor.getIdProperty().getCacheDataValue((EntityBean) ap);
     }
   }
 
+  private Object createCacheBeanId(Object bean) {
+    final BeanDescriptor<?> desc = targetDescriptor.descOf(bean.getClass());
+    final Object id = desc.getIdProperty().getCacheDataValue((EntityBean) bean);
+    return new CachedBeanId(desc.getDiscValue(), id);
+  }
+
   @Override
   public String format(Object value) {
     return targetDescriptor.getIdBinder().cacheKey(value);
@@ -451,19 +460,31 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       if (embedded) {
         setValue(bean, targetDescriptor.cacheEmbeddedBeanLoad((CachedBeanData) cacheData, context));
       } else {
-        if (cacheData instanceof String) {
-          cacheData = targetDescriptor.getIdProperty().scalarType.parse((String) cacheData);
+        if (cacheData instanceof CachedBeanId) {
+          setValue(bean, refInheritBean((CachedBeanId) cacheData, context));
+        } else {
+          setValue(bean, refBean(targetDescriptor, cacheData, context));
         }
-        // cacheData is the id value, maybe already in persistence context
-        Object assocBean = targetDescriptor.contextGet(context, cacheData);
-        if (assocBean == null) {
-          assocBean = targetDescriptor.createReference(cacheData, context);
-        }
-        setValue(bean, assocBean);
       }
     }
   }
 
+  private Object refInheritBean(CachedBeanId cacheId, PersistenceContext context) {
+    final InheritInfo rowInheritInfo = targetInheritInfo.readType(cacheId.getDiscValue());
+    return refBean(rowInheritInfo.desc(), cacheId.getId(), context);
+  }
+
+  private Object refBean(BeanDescriptor<?> desc, Object id, PersistenceContext context) {
+    if (id instanceof String) {
+      id = desc.getIdProperty().scalarType.parse((String) id);
+    }
+    Object bean = desc.contextGet(context, id);
+    if (bean == null) {
+      bean = desc.createRef(id, context);
+    }
+    return bean;
+  }
+
   @Override
   public ScalarDataReader<?> getIdReader() {
     return targetDescriptor.getIdProperty();
@@ -640,14 +661,12 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
   @Override
   public void addTenant(SpiQuery<?> query, Object tenantId) {
-    T refBean = targetDescriptor.createReference(tenantId, null);
-    query.where().eq(name, refBean);
+    query.where().eq(name, targetDescriptor.createRef(tenantId, null));
   }
 
   @Override
   public void setTenantValue(EntityBean entityBean, Object tenantId) {
-    T refBean = targetDescriptor.createReference(tenantId, null);
-    setValue(entityBean, refBean);
+    setValue(entityBean, targetDescriptor.createRef(tenantId, null));
   }
 
   @Override

src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java

@@ -36,7 +36,6 @@ public final class IdBinderSimple implements IdBinder {
   @SuppressWarnings("rawtypes")
   private final ScalarType scalarType;
 
-
   public IdBinderSimple(BeanProperty idProperty, MultiValueBind multiValueBind) {
     this.idProperty = idProperty;
     this.scalarType = idProperty.getScalarType();
@@ -71,7 +70,6 @@ public final class IdBinderSimple implements IdBinder {
 
   @Override
   public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
-
     idProperty.buildRawSqlSelectChain(prefix, selectChain);
   }
 
@@ -218,7 +216,6 @@ public final class IdBinderSimple implements IdBinder {
 
   @Override
   public String getAssocOneIdExpr(String prefix, String operator) {
-
     StringBuilder sb = new StringBuilder();
     if (prefix != null) {
       sb.append(prefix);
@@ -231,7 +228,6 @@ public final class IdBinderSimple implements IdBinder {
 
   @Override
   public String getAssocIdInExpr(String prefix) {
-
     StringBuilder sb = new StringBuilder();
     if (prefix != null) {
       sb.append(prefix);
@@ -243,7 +239,6 @@ public final class IdBinderSimple implements IdBinder {
 
   @Override
   public Object convertId(Object idValue) {
-
     if (!idValue.getClass().equals(expectedType)) {
       return scalarType.toBeanType(idValue);
     }
@@ -252,12 +247,10 @@ public final class IdBinderSimple implements IdBinder {
 
   @Override
   public Object convertSetId(Object idValue, EntityBean bean) {
-
     if (!idValue.getClass().equals(expectedType)) {
       idValue = scalarType.toBeanType(idValue);
     }
     if (bean != null) {
-      // support PropertyChangeSupport
       idProperty.setValueIntercept(bean, idValue);
     }
     return idValue;

src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java

@@ -407,8 +407,11 @@ public class DeployBeanDescriptor<T> {
     identityMode.setSequenceGenerator(genName);
   }
 
-  public int setIdentitySequenceDefaultIncrement() {
-    return identityMode.setSequenceDefaultIncrement();
+  /**
+   * Return the sequence increment to use given sequence batch mode.
+   */
+  public int setIdentitySequenceBatchMode(boolean sequenceBatchMode) {
+    return identityMode.setSequenceBatchMode(sequenceBatchMode);
   }
 
   public void setIdentityType(IdType type) {