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

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

.travis.yml

@@ -1,15 +1,14 @@
-dist: trusty
+dist: xenial
 sudo: required
 language: java
 jdk:
-  - oraclejdk8
   - openjdk11
 
 git:
   depth: 3
 
 addons:
-  postgresql: "9.6"
+  postgresql: 10
 #  apt:
 #    packages:
 #    - mysql-server-5.7

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>12.1.10</version>
+  <version>12.3.6</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -18,42 +18,14 @@
   <properties>
     <jackson-core.version>2.10.0</jackson-core.version>
     <jackson-databind.version>2.10.0</jackson-databind.version>
-    <snakeyaml.version>1.21</snakeyaml.version>
   </properties>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-12.1.10</tag>
+    <tag>ebean-12.3.6</tag>
   </scm>
 
   <profiles>
-    <profile>
-      <!-- Note: to use this profile, you need credentials for the oracle repository in your
-        settings.xml as described here:
-        http://docs.oracle.com/middleware/1213/core/MAVEN/config_maven_repo.htm#MAVEN9010 -->
-      <id>oracle</id>
-      <dependencies>
-        <dependency>
-          <groupId>com.oracle.jdbc</groupId>
-          <artifactId>ojdbc8</artifactId>
-          <version>12.2.0.1</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <repositories>
-        <repository>
-          <id>maven.oracle.com</id>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <url>https://maven.oracle.com</url>
-          <layout>default</layout>
-        </repository>
-      </repositories>
-    </profile>
     <profile>
       <!-- Note: to use this profile, you need to download manually the db2jcc4 driver.
         After that, install it into your local maven repository:
@@ -89,13 +61,10 @@
       <scope>provided</scope>
     </dependency>
 
-    <!--
-    Exclude snakeyaml if you desire - it is not strictly required.
-    -->
     <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>${snakeyaml.version}</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>config</artifactId>
+      <version>1.2</version>
     </dependency>
 
     <!--
@@ -103,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.3</version>
+      <version>6.13</version>
     </dependency>
 
     <dependency>
@@ -130,13 +99,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.7.1</version>
+      <version>5.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>12.1.2</version>
+      <version>12.1.4</version>
     </dependency>
 
     <dependency>
@@ -208,7 +177,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.2</version>
+      <version>42.2.10</version>
       <scope>provided</scope>
     </dependency>
 
@@ -221,17 +190,17 @@
       <scope>test</scope>
     </dependency>
 
-    <!--<dependency>-->
-    <!--<groupId>oracle</groupId>-->
-    <!--<artifactId>oracle-jdbc</artifactId>-->
-    <!--<version>7.0</version>-->
-    <!--<scope>test</scope>-->
-    <!--</dependency>-->
+    <dependency>
+      <groupId>com.oracle.ojdbc</groupId>
+      <artifactId>ojdbc10</artifactId>
+      <version>19.3.0.0</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>io.ebean.test</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>2.10.3</version>
+      <version>3.1.5</version>
       <scope>test</scope>
     </dependency>
 
@@ -247,7 +216,7 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>1.4.197</version>
+      <version>1.4.199</version>
       <scope>provided</scope>
     </dependency>
 
@@ -279,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>
@@ -323,7 +299,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.1.6</version>
+        <version>12.3.4</version>
         <executions>
           <execution>
             <id>test</id>
@@ -341,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

@@ -86,14 +86,14 @@ public class DB {
 
 //  /**
 //   * Register the server with this Ebean singleton. Specify if the registered
-//   * server is the primary/default server.
+//   * server is the primary/default database.
 //   */
 //  public static void register(EbeanServer server, boolean defaultServer) {
 //    serverMgr.register(server, defaultServer);
 //  }
 //
 //  /**
-//   * Backdoor for registering a mock implementation of EbeanServer as the default server.
+//   * Backdoor for registering a mock implementation of EbeanServer as the default database.
 //   */
 //  protected static EbeanServer mock(String name, EbeanServer server, boolean defaultServer) {
 //    EbeanServer originalPrimaryServer = serverMgr.defaultServer;
@@ -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>
@@ -176,6 +192,18 @@ public class DB {
     return getDefault().beginTransaction();
   }
 
+  /**
+   * Create a new transaction that is not held in TransactionThreadLocal.
+   * <p>
+   * You will want to do this if you want multiple Transactions in a single
+   * thread or generally use transactions outside of the TransactionThreadLocal
+   * management.
+   * </p>
+   */
+  public static Transaction createTransaction() {
+    return getDefault().createTransaction();
+  }
+
   /**
    * Start a transaction additionally specifying the isolation level.
    *
@@ -442,6 +470,13 @@ public class DB {
     return getDefault().saveAll(beans);
   }
 
+  /**
+   * Save all the beans from a Collection.
+   */
+  public static int saveAll(Object... beans) throws OptimisticLockException {
+    return getDefault().saveAll(beans);
+  }
+
   /**
    * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
    * properties that violates an unique / primary key. This may be done in an UI save action to
@@ -650,7 +685,7 @@ public class DB {
    *   // find orders and their customers
    *   List<Order> list = DB.find(Order.class)
    *     .fetch("customer")
-   *     .orderBy("id")
+   *     .order("id")
    *     .findList();
    *
    *   // sort by customer name ascending, then by order shipDate

src/main/java/io/ebean/Database.java

@@ -122,7 +122,7 @@ public interface Database {
   String getName();
 
   /**
-   * Return the ExpressionFactory for this server.
+   * Return the ExpressionFactory for this database.
    */
   ExpressionFactory getExpressionFactory();
 
@@ -375,7 +375,7 @@ public interface Database {
    *   // find orders and their customers
    *   List<Order> list = database.find(Order.class)
    *     .fetch("customer")
-   *     .orderBy("id")
+   *     .order("id")
    *     .findList();
    *
    *   // sort by customer name ascending, then by order shipDate
@@ -881,6 +881,11 @@ public interface Database {
    */
   int saveAll(Collection<?> beans) throws OptimisticLockException;
 
+  /**
+   * Save all the beans.
+   */
+  int saveAll(Object... beans) throws OptimisticLockException;
+
   /**
    * Delete the bean.
    * <p>

src/main/java/io/ebean/DatabaseFactory.java

@@ -34,14 +34,14 @@ public class DatabaseFactory {
   }
 
   /**
-   * Create using ebean.properties to configure the server.
+   * Create using ebean.properties to configure the database.
    */
   public static synchronized Database create(String name) {
     return EbeanServerFactory.create(name);
   }
 
   /**
-   * Create using the ServerConfig object to configure the server.
+   * Create using the ServerConfig object to configure the database.
    */
   public static synchronized Database create(DatabaseConfig config) {
     return EbeanServerFactory.create(config);

src/main/java/io/ebean/DocumentStore.java

@@ -61,7 +61,7 @@ public interface DocumentStore {
    * <pre>{@code
    *
    * Customer customer =
-   *   server.find(Customer.class)
+   *   database.find(Customer.class)
    *     .setUseDocStore(true)
    *     .setId(42)
    *     .findOne();
@@ -79,7 +79,7 @@ public interface DocumentStore {
    * <pre>{@code
    *
    * List<Customer> newCustomers =
-   *  server.find(Customer.class)
+   *  database.find(Customer.class)
    *    .setUseDocStore(true)
    *    .where().eq("status, Customer.Status.NEW)
    *    .findList();
@@ -99,7 +99,7 @@ public interface DocumentStore {
    * <pre>{@code
    *
    * PagedList<Customer> newCustomers =
-   *  server.find(Customer.class)
+   *  database.find(Customer.class)
    *    .setUseDocStore(true)
    *    .where().eq("status, Customer.Status.NEW)
    *    .setMaxRows(50)
@@ -120,7 +120,7 @@ public interface DocumentStore {
    * </p>
    * <pre>{@code
    *
-   *  server.find(Order.class)
+   *  database.find(Order.class)
    *    .setUseDocStore(true)
    *    .where()... // perhaps add predicates
    *    .findEach((Order order) -> {
@@ -145,7 +145,7 @@ public interface DocumentStore {
    * </p>
    * <pre>{@code
    *
-   *  server.find(Order.class)
+   *  database.find(Order.class)
    *    .setUseDocStore(true)
    *    .where()... // perhaps add predicates
    *    .findEachWhile(new Predicate<Order>() {
@@ -190,7 +190,7 @@ public interface DocumentStore {
    * Drop the index from the document store (similar to DDL drop table).
    * <pre>{@code
    *
-   *   DocumentStore documentStore = server.docStore();
+   *   DocumentStore documentStore = database.docStore();
    *
    *   documentStore.dropIndex("product_copy");
    *
@@ -202,7 +202,7 @@ public interface DocumentStore {
    * Create an index given a mapping file as a resource in the classPath (similar to DDL create table).
    * <pre>{@code
    *
-   *   DocumentStore documentStore = server.docStore();
+   *   DocumentStore documentStore = database.docStore();
    *
    *   // uses product_copy.mapping.json resource
    *   // ... to define mappings for the index
@@ -289,7 +289,7 @@ public interface DocumentStore {
    * <pre>{@code
    *
    *  // predicates to select the source documents to copy
-   *  Query<Product> query = server.find(Product.class)
+   *  Query<Product> query = database.find(Product.class)
    *    .where()
    *      .ge("whenModified", new Timestamp(since))
    *      .ge("name", "A")

src/main/java/io/ebean/DtoQuery.java

@@ -77,12 +77,29 @@ public interface DtoQuery<T> {
   Optional<T> findOneOrEmpty();
 
   /**
-   * The same as bind for named parameters.
+   * Bind all the parameters using index positions.
+   * <p>
+   * Binds each parameter moving the index position each time.
+   * <p>
+   * A convenience for multiple calls to {@link #setParameter(Object)}
+   */
+  DtoQuery<T> setParameters(Object... value);
+
+  /**
+   * Bind the next parameter using index position.
+   * <p>
+   * Bind the parameter using index position starting at 1 and incrementing.
+   * <p>
+   */
+  DtoQuery<T> setParameter(Object value);
+
+  /**
+   * Bind the named parameter.
    */
   DtoQuery<T> setParameter(String name, Object value);
 
   /**
-   * The same as bind for positioned parameters.
+   * Bind the parameter by its index position (1 based like JDBC).
    */
   DtoQuery<T> setParameter(int position, Object value);
 
@@ -136,4 +153,8 @@ public interface DtoQuery<T> {
    */
   DtoQuery<T> setBufferFetchSizeHint(int bufferFetchSizeHint);
 
+  /**
+   * Use the explicit transaction to execute the query.
+   */
+  DtoQuery<T> usingTransaction(Transaction transaction);
 }

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);
 
@@ -82,7 +83,7 @@ public final class Ebean {
 
       } catch (DataSourceConfigurationException e) {
         String msg = "Configuration error creating DataSource for the default Database." +
-          " This typically means a missing application-test.yaml or missing ebean-test-config dependency." +
+          " This typically means a missing application-test.yaml or missing ebean-test dependency." +
           " See https://ebean.io/docs/trouble-shooting#datasource";
         throw new DataSourceConfigurationException(msg, e);
 
@@ -187,7 +188,7 @@ public final class Ebean {
   }
 
   /**
-   * Return the ExpressionFactory from the default server.
+   * Return the ExpressionFactory from the default database.
    * <p>
    * The ExpressionFactory is used internally by the query and ExpressionList to
    * build the WHERE and HAVING clauses. Alternatively you can use the
@@ -209,14 +210,14 @@ public final class Ebean {
 
   /**
    * Register the server with this Ebean singleton. Specify if the registered
-   * server is the primary/default server.
+   * server is the primary/default database.
    */
   public static void register(EbeanServer server, boolean defaultServer) {
     serverMgr.register(server, defaultServer);
   }
 
   /**
-   * Backdoor for registering a mock implementation of EbeanServer as the default server.
+   * Backdoor for registering a mock implementation of EbeanServer as the default database.
    */
   protected static EbeanServer mock(String name, EbeanServer server, boolean defaultServer) {
     EbeanServer originalPrimaryServer = serverMgr.defaultServer;
@@ -796,7 +797,7 @@ public final class Ebean {
    *   // find orders and their customers
    *   List<Order> list = Ebean.find(Order.class)
    *     .fetch("customer")
-   *     .orderBy("id")
+   *     .order("id")
    *     .findList();
    *
    *   // sort by customer name ascending, then by order shipDate

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 {
 
 
@@ -48,7 +51,7 @@ public class EbeanServerFactory {
   }
 
   /**
-   * Create using ebean.properties to configure the server.
+   * Create using ebean.properties to configure the database.
    */
   public static synchronized EbeanServer create(String name) {
 
@@ -59,7 +62,7 @@ public class EbeanServerFactory {
   }
 
   /**
-   * Create using the ServerConfig object to configure the server.
+   * Create using the ServerConfig object to configure the database.
    */
   public static synchronized EbeanServer create(ServerConfig config) {
 

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

@@ -30,7 +30,7 @@ import java.util.function.Predicate;
  * </p>
  * <p>
  * The ExpressionList also duplicates methods that are found on the Query such
- * as findList() and orderBy(). The purpose of these methods is provide a fluid
+ * as findList() and order(). The purpose of these methods is provide a fluid
  * API. The upside of this approach is that you can build and execute a query
  * via chained methods. The down side is that this ExpressionList object has
  * more methods than you would initially expect (the ones duplicated from
@@ -52,6 +52,14 @@ public interface ExpressionList<T> {
    */
   Query<T> query();
 
+  /**
+   * Controls, if paginated queries should always append an 'order by id' statement at the end to
+   * guarantee a deterministic sort result. This may affect performance.
+   * If this is not enabled, and an orderBy is set on the query, it's up to the programmer that
+   * this query provides a deterministic result.
+   */
+  Query<T> orderById(boolean orderById);
+
   /**
    * Set the order by clause replacing the existing order by clause if there is
    * one.
@@ -59,12 +67,18 @@ public interface ExpressionList<T> {
    * This follows SQL syntax using commas between each property with the
    * optional asc and desc keywords representing ascending and descending order
    * respectively.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #orderBy(String)}.
-   * </p>
    */
-  Query<T> order(String orderByClause);
+  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
@@ -72,7 +86,8 @@ public interface ExpressionList<T> {
    * <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();
 
@@ -82,22 +97,15 @@ public interface ExpressionList<T> {
    * <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>order()</code>
    */
   OrderBy<T> orderBy();
 
   /**
-   * Add an orderBy clause to the query.
-   *
-   * @see Query#orderBy(String)
-   */
-  Query<T> orderBy(String orderBy);
-
-  /**
-   * Add an orderBy clause to the query.
-   *
-   * @see Query#orderBy(String)
+   * Deprecated migrate to {@link #orderBy(String)}
    */
+  @Deprecated
   Query<T> setOrderBy(String orderBy);
 
   /**
@@ -334,7 +342,7 @@ public interface ExpressionList<T> {
    *  List<String> names =
    *    DB.find(Customer.class)
    *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findSingleAttributeList();
    *
    * }</pre>
@@ -347,7 +355,7 @@ public interface ExpressionList<T> {
    *      .setDistinct(true)
    *      .select("name")
    *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .setMaxRows(100)
    *      .findSingleAttributeList();
    *
@@ -508,7 +516,7 @@ public interface ExpressionList<T> {
    * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
    * @param params       Bind parameters used in the expressions
    */
-  Query<T> filterMany(String manyProperty, String expressions, Object... params);
+  ExpressionList<T> filterMany(String manyProperty, String expressions, Object... params);
 
   /**
    * Specify specific properties to fetch on the main/root bean (aka partial
@@ -559,14 +567,14 @@ public interface ExpressionList<T> {
    *
    * @see Query#setFirstRow(int)
    */
-  Query<T> setFirstRow(int firstRow);
+  ExpressionList<T> setFirstRow(int firstRow);
 
   /**
    * Set the maximum number of rows to fetch.
    *
    * @see Query#setMaxRows(int)
    */
-  Query<T> setMaxRows(int maxRows);
+  ExpressionList<T> setMaxRows(int maxRows);
 
   /**
    * Set the name of the property which values become the key of a map.
@@ -1243,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>
@@ -1272,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);
 
@@ -1451,7 +1481,7 @@ public interface ExpressionList<T> {
    *        .eq("status", Customer.Status.ACTIVE)
    *        .gt("id", 0)
    *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findList();
    * }</pre>
    */
@@ -1472,7 +1502,7 @@ public interface ExpressionList<T> {
    *    .or()
    *      .eq("status", Customer.Status.ACTIVE)
    *      .isNull("anniversary")
-   *    .orderBy().asc("name")
+   *    .order().asc("name")
    *    .findList();
    *
    * }</pre>
@@ -1492,7 +1522,7 @@ public interface ExpressionList<T> {
    *        .eq("status", Customer.Status.ACTIVE)
    *        .gt("id", 0)
    *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findList();
    *
    * }</pre>
@@ -1526,7 +1556,7 @@ public interface ExpressionList<T> {
    *       .gt("id", 1)
    *       .eq("anniversary", onAfter)
    *       .endNot()
-   *     .orderBy()
+   *     .order()
    *       .asc("name")
    *     .findList();
    *

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

@@ -1,8 +1,5 @@
 package io.ebean;
 
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.api.SpiTransaction;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
@@ -70,7 +67,7 @@ public interface ExtendedServer {
    *
    * @return True if the query finds a matching row in the database
    */
-  <T> boolean exists(SpiQuery<?> ormQuery, SpiTransaction transaction);
+  <T> boolean exists(Query<?> ormQuery, Transaction transaction);
 
   /**
    * Return the number of 'top level' or 'root' entities this query should return.
@@ -95,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)
@@ -109,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>
@@ -118,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);
 
   /**
@@ -360,7 +363,7 @@ public interface ExtendedServer {
    *  List<String> names =
    *    DB.find(Customer.class)
    *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findSingleAttributeList();
    *
    * }</pre>
@@ -372,7 +375,7 @@ public interface ExtendedServer {
    *      .setDistinct(true)
    *      .select("name")
    *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .setMaxRows(100)
    *      .findSingleAttributeList();
    *

src/main/java/io/ebean/Finder.java

@@ -32,7 +32,7 @@ import java.util.List;
  *   public List<Customer> findNew() {
  *     return query().where()
  *       .eq("status", Customer.Status.NEW)
- *       .orderBy("name")
+ *       .order("name")
  *       .findList()
  *   }
  * }

src/main/java/io/ebean/Model.java

@@ -192,6 +192,13 @@ public abstract class Model {
     db().save(this);
   }
 
+  /**
+   * Save this entity with an explicit transaction.
+   */
+  public void save(Transaction transaction) {
+    db().save(this, transaction);
+  }
+
   /**
    * Flush any batched changes to the database.
    * <p>
@@ -212,6 +219,13 @@ public abstract class Model {
     db().update(this);
   }
 
+  /**
+   * Update this entity with an explicit transaction.
+   */
+  public void update(Transaction transaction) {
+    db().update(this, transaction);
+  }
+
   /**
    * Insert this entity.
    *
@@ -221,6 +235,13 @@ public abstract class Model {
     db().insert(this);
   }
 
+  /**
+   * Insert with an explicit transaction.
+   */
+  public void insert(Transaction transaction) {
+    db().insert(this, transaction);
+  }
+
   /**
    * Delete this bean.
    * <p>
@@ -242,6 +263,13 @@ public abstract class Model {
     return db().delete(this);
   }
 
+  /**
+   * Delete this entity with an explicit transaction.
+   */
+  public boolean delete(Transaction transaction) {
+    return db().delete(this, transaction);
+  }
+
   /**
    * Delete a bean permanently without soft delete.
    * <p>
@@ -255,6 +283,13 @@ public abstract class Model {
     return db().deletePermanent(this);
   }
 
+  /**
+   * Delete a bean permanently without soft delete using an explicit transaction.
+   */
+  public boolean deletePermanent(Transaction transaction) {
+    return db().deletePermanent(this, transaction);
+  }
+
   /**
    * Refreshes this entity from the database.
    *

src/main/java/io/ebean/Pairs.java

@@ -30,7 +30,7 @@ import java.util.List;
  *   .where()
  *   .eq("store", "def")
  *   .inPairs(pairs)       // IN clause with 'pairs' of values
- *   .orderBy("sku desc")
+ *   .order("sku desc")
  *
  *   // query expressions cover the natural key properties
  *   // so we can choose to hit the L2 bean cache if we want

src/main/java/io/ebean/PrimaryServer.java

@@ -1,38 +1,36 @@
 package io.ebean;
 
-import io.ebean.config.properties.PropertiesLoader;
+import io.avaje.config.Config;
 
 import java.util.Properties;
 
 /**
- * Provides singleton state for the default server.
+ * Provides singleton state for the default database.
  * <p/>
- * Intended for internal use as part of bootup, construction, registration of the default server.
+ * Intended for internal use as part of bootup, construction, registration of the default database.
  */
 class PrimaryServer {
 
-  private static Properties globalProperties;
-
   private static String defaultServerName;
 
   private static boolean skip;
 
   /**
-   * Set whether to skip automatically creating the primary server.
+   * Set whether to skip automatically creating the primary database.
    */
   static synchronized void setSkip(boolean skip) {
     PrimaryServer.skip = skip;
   }
 
   /**
-   * Return true to skip automatically creating the primary server.
+   * Return true to skip automatically creating the primary database.
    */
   static synchronized boolean isSkip() {
     return skip;
   }
 
   /**
-   * Return the default server name.
+   * Return the default database name.
    */
   static synchronized String getDefaultServerName() {
     getProperties();
@@ -43,14 +41,10 @@ class PrimaryServer {
    * Return the default configuration Properties.
    */
   static synchronized Properties getProperties() {
-    if (globalProperties == null) {
-      globalProperties = PropertiesLoader.load();
-    }
     if (defaultServerName == null) {
       defaultServerName = determineDefaultServerName();
     }
-    return globalProperties;
-
+    return Config.asProperties();
   }
 
   /**
@@ -62,15 +56,9 @@ class PrimaryServer {
     defaultServerName = System.getProperty("db", defaultServerName);
     defaultServerName = System.getProperty("ebean_db", defaultServerName);
     if (isEmpty(defaultServerName)) {
-      defaultServerName = System.getProperty("datasource.default");
+      defaultServerName = Config.get("datasource.default", null);
       if (isEmpty(defaultServerName)) {
-        defaultServerName = System.getProperty("ebean.default.datasource");
-        if (isEmpty(defaultServerName)) {
-          defaultServerName = globalProperties.getProperty("datasource.default");
-          if (isEmpty(defaultServerName)) {
-            defaultServerName = globalProperties.getProperty("ebean.default.datasource");
-          }
-        }
+        defaultServerName = Config.get("ebean.default.datasource", null);
       }
     }
     if (defaultServerName == null) {

src/main/java/io/ebean/ProfileLocation.java

@@ -31,9 +31,9 @@ public interface ProfileLocation {
   }
 
   /**
-   * Obtain the location description.
+   * Obtain the description returning true if this is the initial call.
    */
-  String obtain();
+  boolean obtain();
 
   /**
    * Return a short version of the location description.
@@ -45,8 +45,23 @@ public interface ProfileLocation {
    */
   String label();
 
+  /**
+   * Return the full location.
+   */
+  String fullLocation();
+
   /**
    * Add execution time.
    */
   void add(long executionTime);
+
+  /**
+   * Return true if this request should be traced.
+   */
+  boolean trace();
+
+  /**
+   * Set the number of times to trace the transactions for this profile location.
+   */
+  void setTraceCount(int traceCount);
 }

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

@@ -25,7 +25,7 @@ import java.util.stream.Stream;
  *     .where()
  *       .like("customer.name","rob%")
  *       .gt("orderDate",lastWeek)
- *     .orderBy("customer.id, id desc")
+ *     .order("customer.id, id desc")
  *     .setMaxRows(50)
  *     .findList();
  *
@@ -656,6 +656,11 @@ public interface Query<T> {
    */
   Query<T> usingConnection(Connection connection);
 
+  /**
+   * Execute the query using the given database.
+   */
+  Query<T> usingDatabase(Database database);
+
   /**
    * Execute the query returning the list of Id's.
    * <p>
@@ -706,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
    *
@@ -726,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
@@ -744,6 +751,7 @@ public interface Query<T> {
    * }</pre>
    */
   @Nonnull
+  @Deprecated
   Stream<T> findLargeStream();
 
   /**
@@ -885,7 +893,7 @@ public interface Query<T> {
    *  List<String> names =
    *    DB.find(Customer.class)
    *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findSingleAttributeList();
    *
    * }</pre>
@@ -898,7 +906,7 @@ public interface Query<T> {
    *      .setDistinct(true)
    *      .select("name")
    *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .setMaxRows(100)
    *      .findSingleAttributeList();
    *
@@ -1183,6 +1191,30 @@ public interface Query<T> {
    */
   Query<T> setParameter(int position, Object value);
 
+  /**
+   * Bind the next positioned parameter.
+   *
+   * <pre>{@code
+   *
+   * // a query with a positioned parameters
+   * String oql = "where status = ? and name = ?";
+   *
+   * List<Order> list = DB.createQuery(Order.class, oql)
+   *   .setParameter(OrderStatus.NEW)
+   *   .setParameter("Rob")
+   *   .findList();
+   *
+   * }</pre>
+   */
+  Query<T> setParameter(Object value);
+
+  /**
+   * Bind all the positioned parameters.
+   * <p>
+   * A convenience for multiple calls to {@link #setParameter(Object)}
+   */
+  Query<T> setParameters(Object... values);
+
   /**
    * Set the Id value to query. This is used with findOne().
    * <p>
@@ -1329,10 +1361,6 @@ public interface Query<T> {
    * This follows SQL syntax using commas between each property with the
    * optional asc and desc keywords representing ascending and descending order
    * respectively.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #order(String)}.
-   * </p>
    */
   Query<T> orderBy(String orderByClause);
 
@@ -1343,10 +1371,6 @@ public interface Query<T> {
    * This follows SQL syntax using commas between each property with the
    * optional asc and desc keywords representing ascending and descending order
    * respectively.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #orderBy(String)}.
-   * </p>
    */
   Query<T> order(String orderByClause);
 
@@ -1356,10 +1380,8 @@ 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>
    * <p>
-   * This is EXACTLY the same as {@link #orderBy()}.
-   * </p>
+   * This is the same as <code>orderBy()</code>
    */
   OrderBy<T> order();
 
@@ -1369,26 +1391,18 @@ 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>
    * <p>
-   * This is EXACTLY the same as {@link #order()}.
-   * </p>
+   * This is the same as <code>order()</code>
    */
   OrderBy<T> orderBy();
 
   /**
    * Set an OrderBy object to replace any existing OrderBy clause.
-   * <p>
-   * This is EXACTLY the same as {@link #setOrderBy(OrderBy)}.
-   * </p>
    */
   Query<T> setOrder(OrderBy<T> orderBy);
 
   /**
    * Set an OrderBy object to replace any existing OrderBy clause.
-   * <p>
-   * This is EXACTLY the same as {@link #setOrder(OrderBy)}.
-   * </p>
    */
   Query<T> setOrderBy(OrderBy<T> orderBy);
 
@@ -1524,17 +1538,6 @@ public interface Query<T> {
     return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
   }
 
-  /**
-   * Set an id to identify this query for profiling purposes.
-   * <p>
-   * The profileId is expected to be unique for a given bean type.
-   * </p>
-   * <p>
-   * Note that the profileId is treated as a short internally and has a MAX value of 32,767.
-   * </p>
-   */
-  Query<T> setProfileId(int profileId);
-
   /**
    * Set the profile location of this query. This is used to relate query execution metrics
    * back to a location like a specific line of code.

src/main/java/io/ebean/QueryIterator.java

@@ -23,9 +23,9 @@ import java.util.Iterator;
  * <h3>Try finally style</h3>
  * <pre>{@code
  *
- *  Query<Customer> query = server.find(Customer.class)
+ *  Query<Customer> query = database.find(Customer.class)
  *     .where().gt("id", 0)
- *     .orderBy("id")
+ *     .order("id")
  *     .setMaxRows(2);
  *
  *  QueryIterator<Customer> it = query.findIterate();

src/main/java/io/ebean/RowMapper.java

@@ -18,7 +18,7 @@ import java.sql.SQLException;
  * <pre>{@code
  *
  *    //
- *    // A mapper from ResultSet into our CustomerDto bean
+ *    // Map from ResultSet to CustomerDto bean
  *    //
  *    class CustomerMapper implements RowMapper<CustomerDto> {
  *
@@ -42,7 +42,8 @@ import java.sql.SQLException;
  *
  *  CustomerDto rob = DB.sqlQuery(sql)
  *    .setParameter(1, "Rob")
- *    .findOne(CUSTOMER_MAPPER);
+ *    .mapTo(CUSTOMER_MAPPER)
+ *    .findOne();
  *
  *
  * }</pre>

src/main/java/io/ebean/ScriptRunner.java

@@ -50,4 +50,13 @@ public interface ScriptRunner {
    */
   void run(URL resource, Map<String, String> placeholderMap);
 
+  /**
+   * Run the raw provided DDL or SQL script.
+   *
+   * @param name          The name of the script for logging purposes
+   * @param content       The SQL content
+   * @param useAutoCommit Set to true to use auto commit true and continue when any errors occur
+   */
+  void runScript(String name, String content, boolean useAutoCommit);
+
 }

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

@@ -75,17 +75,15 @@ public interface SqlQuery extends Serializable {
   SqlRow findOne();
 
   /**
-   * Execute the query returning a single result using the mapper.
-   *
-   * @param mapper Used to map each ResultSet row into the result object.
+   * Deprecated migrate to use {@link #mapTo(RowMapper)}
    */
+  @Deprecated
   <T> T findOne(RowMapper<T> mapper);
 
   /**
-   * Execute the query returning a list using the mapper.
-   *
-   * @param mapper Used to map each ResultSet row into the result object.
+   * Deprecated migrate to use {@link #mapTo(RowMapper)}
    */
+  @Deprecated
   <T> List<T> findList(RowMapper<T> mapper);
 
   /**
@@ -125,77 +123,53 @@ public interface SqlQuery extends Serializable {
   Optional<SqlRow> findOneOrEmpty();
 
   /**
-   * Execute the query returning a single scalar attribute.
-   * <pre>@{code
+   * Deprecated - migrate to <code>.mapToScalar(attributeType).findOne()</code>.
+   * <pre>{@code
    *
-   *   String sql = "select max(unit_price) from o_order_detail where order_qty > ?";
-   *
-   *   BigDecimal maxPrice = DB.sqlQuery(sql)
-   *     .setParameter(1, 2)
-   *     .findSingleAttribute(BigDecimal.class);
-   *
-   * }</pre>
-   *
-   * <p>
-   * The attributeType can be any scalar type that Ebean supports (includes javax time types, Joda types etc).
-   * </p>
-   *
-   * @param attributeType The type of the returned value
+   *    .mapToScalar(BigDecimal.class)
+   *    .findOne();
+   * }
    */
+  @Deprecated
   <T> T findSingleAttribute(Class<T> attributeType);
 
   /**
-   * Execute the query returning a single BigDecimal value.
-   * <p>
-   * This is an alias for <code>findSingleAttribute(BigDecimal.class)</code>
-   * </p>
+   * Deprecated - migrate to <code>.mapToScalar(BigDecimal.class).findOne()</code>.
+   * <pre>{@code
+   *
+   *    .mapToScalar(BigDecimal.class)
+   *    .findOne();
+   * }
    */
+  @Deprecated
   BigDecimal findSingleDecimal();
 
   /**
-   * Execute the query returning a single Long value.
-   * <p>
-   * This is an alias for <code>findSingleAttribute(Long.class)</code>
-   * </p>
+   * Deprecated - migrate to <code>.mapToScalar(Long.class).findOne()</code>.
+   * <pre>{@code
+   *
+   *    .mapToScalar(Long.class)
+   *    .findOne();
+   * }
    */
+  @Deprecated
   Long findSingleLong();
 
   /**
-   * Execute the query returning a list of scalar attribute values.
-   *
+   * Deprecated - migrate to <code>.mapToScalar(Long.class).findList()</code>.
    * <pre>{@code
    *
-   *   String sql =
-   *   " select (unit_price * order_qty) " +
-   *   " from o_order_detail " +
-   *   " where unit_price > ? " +
-   *   " order by (unit_price * order_qty) desc";
-   *
-   *   //
-   *   List<BigDecimal> lineAmounts =
-   *     DB.sqlQuery(sql)
-   *       .setParameter(1, 3)
-   *       .findSingleAttributeList(BigDecimal.class);
-   *
-   * }</pre>
-   *
-   * <p>
-   * The attributeType can be any scalar type that Ebean supports (includes javax time types, Joda types etc).
-   * </p>
-   *
-   * @param attributeType The type of the returned value
+   *    .mapToScalar(Long.class)
+   *    .findList();
+   * }
    */
+  @Deprecated
   <T> List<T> findSingleAttributeList(Class<T> attributeType);
 
-  /**
-   * The same as bind for named parameters.
-   */
-  SqlQuery setParameter(String name, Object value);
-
   /**
    * Set one of more positioned parameters.
    * <p>
-   * This is a convenient alternative to multiple calls setParameter().
+   * This is a convenient alternative to multiple calls to {@link #setParameter(Object)}.
    *
    * <pre>{@code
    *
@@ -203,27 +177,104 @@ public interface SqlQuery extends Serializable {
    *
    *   List<SqlRow> list =
    *     DB.sqlQuery(sql)
-   *       .setParams("Rob", Status.NEW)
+   *       .setParameters("Rob", Status.NEW)
    *       .findList();
    *
    *
-   *   // is the same as ...
+   *   // effectively the same as ...
+   *
+   *       .setParameter("Rob")
+   *       .setParameter("Status.NEW)
+   *
+   *   // and ...
    *
-   *   List<SqlRow> list =
-   *     DB.sqlQuery(sql)
    *       .setParameter(1, "Rob")
    *       .setParameter(2, "Status.NEW)
-   *       .findList();
    *
    * }</pre>
    */
+  SqlQuery setParameters(Object... values);
+
+  /**
+   * Deprecated migrate to setParameters(Object... values)
+   */
+  @Deprecated
   SqlQuery setParams(Object... values);
 
   /**
-   * The same as bind for positioned parameters.
+   * Set the next bind parameter by position.
+   * <pre>{@code
+   *
+   *   String sql = "select id, name from customer where name like ? and status = ?";
+   *
+   *   List<SqlRow> list =
+   *     DB.sqlQuery(sql)
+   *       .setParameter("Rob")
+   *       .setParameter("Status.NEW)
+   *       .findList();
+   *
+   *   // the same as ...
+   *
+   *       .setParameters("Rob", Status.NEW)
+   *
+   *   // and ...
+   *
+   *       .setParameter(1, "Rob")
+   *       .setParameter(2, "Status.NEW)
+   *
+   * }</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);
 
+  /**
+   * Bind the named parameter value.
+   */
+  SqlQuery setParameter(String name, Object value);
+
   /**
    * Set the index of the first row of the results to return.
    */
@@ -260,4 +311,59 @@ public interface SqlQuery extends Serializable {
    */
   SqlQuery setBufferFetchSizeHint(int bufferFetchSizeHint);
 
+  /**
+   * The query result maps to a single scalar value like Long, BigDecimal,
+   * String, UUID, OffsetDateTime etc.
+   * <p>
+   * Any scalar type Ebean is aware of can be used including java time
+   * types like Instant, LocalDate, OffsetDateTime, UUID, Inet, Cdir etc.
+   *
+   * <pre>{@code
+   *
+   *   String sql = " select min(updtime) from o_order_detail " +
+   *                " where unit_price > ? and updtime is not null ";
+   *
+   *   OffsetDateTime minCreated = DB.sqlQuery(sql)
+   *     .setParameter(42)
+   *     .mapToScalar(OffsetDateTime.class)
+   *     .findOne();
+   *
+   * }</pre>
+   *
+   * @param attributeType The type the result is returned as
+   * @return The query to execute via findOne() findList() etc
+   */
+  <T> TypeQuery<T> mapToScalar(Class<T> attributeType);
+
+  /**
+   * Use a RowMapper to map the result to beans.
+   *
+   * @param mapper Maps rows to beans
+   * @param <T>    The type of beans mapped to
+   * @return The query to execute by findOne() findList() etc
+   */
+  <T> TypeQuery<T> mapTo(RowMapper<T> mapper);
+
+  /**
+   * Query mapping to single scalar values.
+   *
+   * @param <T> The type of the scalar values
+   */
+  interface TypeQuery<T> {
+
+    /**
+     * Return the single value.
+     */
+    T findOne();
+
+    /**
+     * Return the single value that is optional.
+     */
+    Optional<T> findOneOrEmpty();
+
+    /**
+     * Return the list of values.
+     */
+    List<T> findList();
+  }
 }

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();
@@ -239,28 +261,47 @@ public interface SqlUpdate {
    *   String sql = "insert into audit_log (id, name, version) values (?,?,?)";
    *
    *   DB.sqlUpdate(sql)
-   *       .setParams(UUID.randomUUID(), "Hello", 1)
+   *       .setParameters(UUID.randomUUID(), "Hello", 1)
    *       .executeNow();
    *
    *
    *   // is the same as ...
    *
    *   DB.sqlUpdate(sql)
+   *       .setParameter(UUID.randomUUID())
+   *       .setParameter("Hello")
+   *       .setParameter(1)
+   *       .executeNow();
+   *
+   *   // which is the same as ...
+   *
+   *   DB.sqlUpdate(sql)
    *       .setParameter(1, UUID.randomUUID())
    *       .setParameter(2, "Hello")
    *       .setParameter(3, 1)
    *       .executeNow();
    *
    * }</pre>
-   *
    */
+  SqlUpdate setParameters(Object... values);
+
+  /**
+   * Deprecated migrate to setParameters(Object... values).
+   */
+  @Deprecated
   SqlUpdate setParams(Object... values);
 
   /**
-   * Set the next positioned parameter.
+   * Set the next bind parameter by position.
    *
    * @param value The value to bind
    */
+  SqlUpdate setParameter(Object value);
+
+  /**
+   * Deprecated migrate to setParameter(value).
+   */
+  @Deprecated
   SqlUpdate setNextParameter(Object value);
 
   /**

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

@@ -295,7 +295,7 @@ public interface Transaction extends AutoCloseable {
    *
    * <pre>{@code
    *
-   * try (Transaction transaction = server.beginTransaction()) {
+   * try (Transaction transaction = database.beginTransaction()) {
    *
    *   // turn on JDBC batch
    *   transaction.setBatchMode(true);
@@ -313,12 +313,12 @@ 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
    *
-   * try (Transaction transaction = server.beginTransaction()) {
+   * try (Transaction transaction = database.beginTransaction()) {
    *
    *   transaction.setBatchMode(true);
    *   transaction.setBatchSize(100);
@@ -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

@@ -1,6 +1,7 @@
 package io.ebean.bean;
 
 import io.ebean.DB;
+import io.ebean.Database;
 import io.ebean.ValuePair;
 
 import javax.persistence.EntityNotFoundException;
@@ -39,6 +40,8 @@ public final class EntityBeanIntercept implements Serializable {
 
   private String ebeanServerName;
 
+  private boolean deletedFromCollection;
+
   /**
    * The actual entity bean that 'owns' this intercept.
    */
@@ -79,14 +82,14 @@ public final class EntityBeanIntercept implements Serializable {
   private static final byte FLAG_CHANGED_PROP = 2;
 
   /**
-   * Flags indicating if a property is a dirty embedded bean. Used to distingush
+   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
    * between an embedded bean being completely overwritten and one of its
    * embedded properties being made dirty.
    */
   private static final byte FLAG_EMBEDDED_DIRTY = 4;
 
   /**
-   * Flags indicating if a property is a dirty embedded bean. Used to distingush
+   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
    * between an embedded bean being completely overwritten and one of its
    * embedded properties being made dirty.
    */
@@ -104,9 +107,6 @@ public final class EntityBeanIntercept implements Serializable {
 
   /**
    * Create a intercept with a given entity.
-   * <p>
-   * Refer to agent ProxyConstructor.
-   * </p>
    */
   public EntityBeanIntercept(Object ownerBean) {
     this.owner = (EntityBean) ownerBean;
@@ -371,13 +371,11 @@ public final class EntityBeanIntercept implements Serializable {
   /**
    * Set the loaded state to true.
    * <p>
-   * Calls to setter methods after the bean is loaded can result in 'Old Values'
-   * being created to support ConcurrencyMode.ALL
-   * </p>
+   * Calls to setter methods after the bean is loaded can result in
+   * 'Old Values' being created.
    * <p>
    * Worth noting that this is also set after a insert/update. By doing so it
    * 'resets' the bean for making further changes and saving again.
-   * </p>
    */
   public void setLoaded() {
     this.state = STATE_LOADED;
@@ -391,8 +389,7 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   /**
-   * When finished loading for lazy or refresh on an already partially populated
-   * bean.
+   * When finished loading for lazy or refresh on an already partially populated bean.
    */
   public void setLoadedLazy() {
     this.state = STATE_LOADED;
@@ -423,9 +420,6 @@ public final class EntityBeanIntercept implements Serializable {
 
   /**
    * Set true to turn off lazy loading.
-   * <p>
-   * Typically used to disable lazy loading on SQL based report beans.
-   * </p>
    */
   public void setDisableLazyLoad(boolean disableLazyLoad) {
     this.disableLazyLoad = disableLazyLoad;
@@ -445,7 +439,6 @@ public final class EntityBeanIntercept implements Serializable {
    * Return true if the embedded bean is new or dirty and hence needs saving.
    */
   public boolean isEmbeddedNewOrDirty(Object embeddedBean) {
-
     if (embeddedBean == null) {
       // if it was previously set then the owning bean would
       // have oldValues containing the previous embedded bean
@@ -453,7 +446,6 @@ public final class EntityBeanIntercept implements Serializable {
     }
     if (embeddedBean instanceof EntityBean) {
       return ((EntityBean) embeddedBean)._ebean_getIntercept().isNewOrDirty();
-
     } else {
       // non-enhanced so must assume it is new and needs to be saved
       return true;
@@ -471,8 +463,8 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   /**
-   * Finds the index position of a given property. Returns -1 if the property
-   * can not be found.
+   * Finds the index position of a given property. Returns -1 if the
+   * property can not be found.
    */
   public int findProperty(String propertyName) {
     String[] names = owner._ebean_getPropertyNames();
@@ -495,7 +487,7 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   /**
-   * Return the number of properties.s
+   * Return the number of properties.
    */
   public int getPropertyLength() {
     return owner._ebean_getPropertyNames().length;
@@ -517,8 +509,7 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   /**
-   * Set the property to be treated as unloaded. Used for properties initialised in default
-   * constructor.
+   * Set the property to be treated as unloaded. Used for properties initialised in default constructor.
    */
   public void setPropertyUnloaded(int propertyIndex) {
     flags[propertyIndex] &= ~FLAG_LOADED_PROP;
@@ -605,7 +596,6 @@ public final class EntityBeanIntercept implements Serializable {
    * For forced update on a 'New' bean set all the loaded properties to changed.
    */
   public void setNewBeanForUpdate() {
-
     for (int i = 0; i < flags.length; i++) {
       if ((flags[i] & FLAG_LOADED_PROP) != 0) {
         flags[i] |= FLAG_CHANGED_PROP;
@@ -660,8 +650,7 @@ public final class EntityBeanIntercept implements Serializable {
     for (int i = 0; i < len; i++) {
       if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
         // the property has been changed on this bean
-        String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
-        props.add(propName);
+        props.add((prefix == null ? getProperty(i) : prefix + getProperty(i)));
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
         EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
@@ -674,12 +663,10 @@ public final class EntityBeanIntercept implements Serializable {
    * Return true if any of the given property names are dirty.
    */
   public boolean hasDirtyProperty(Set<String> propertyNames) {
-
     String[] names = owner._ebean_getPropertyNames();
     int len = getPropertyLength();
     for (int i = 0; i < len; i++) {
       if ((flags[i] & FLAG_CHANGED_PROP) != 0) {
-        // the property has been changed on this bean
         if (propertyNames.contains(names[i])) {
           return true;
         }
@@ -712,10 +699,9 @@ public final class EntityBeanIntercept implements Serializable {
         String propName = (prefix == null ? getProperty(i) : prefix + getProperty(i));
         Object newVal = owner._ebean_getField(i);
         Object oldVal = getOrigValue(i);
-        if (!areEqual(oldVal, newVal)) {
+        if (notEqual(oldVal, newVal)) {
           dirtyValues.put(propName, new ValuePair(newVal, oldVal));
         }
-
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
         EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
@@ -734,10 +720,9 @@ public final class EntityBeanIntercept implements Serializable {
         // the property has been changed on this bean
         Object newVal = owner._ebean_getField(i);
         Object oldVal = getOrigValue(i);
-        if (!areEqual(oldVal, newVal)) {
+        if (notEqual(oldVal, newVal)) {
           visitor.visit(i, newVal, oldVal);
         }
-
       } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) {
         // an embedded property has been changed - recurse
         EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
@@ -758,7 +743,7 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   /**
-   * Add and return a dirty property hash recursing into embedded beans.
+   * Add and return a dirty property hash.
    */
   private void addDirtyPropertyKey(StringBuilder sb) {
     if (sortOrder > 0) {
@@ -818,21 +803,18 @@ public final class EntityBeanIntercept implements Serializable {
    * Load the bean when it is a reference.
    */
   protected void loadBean(int loadProperty) {
-
     synchronized (this) {
       if (beanLoader == null) {
-        BeanLoader serverLoader = (BeanLoader) DB.byName(ebeanServerName);
-        if (serverLoader == null) {
-          throw new PersistenceException("Server [" + ebeanServerName + "] was not found?");
+        final Database database = DB.byName(ebeanServerName);
+        if (database == null) {
+          throw new PersistenceException("Database [" + ebeanServerName + "] was not found?");
         }
-
         // For stand alone reference bean or after deserialisation lazy load
         // using the ebeanServer. Synchronise only on the bean.
-        loadBeanInternal(loadProperty, serverLoader);
+        loadBeanInternal(loadProperty, database.getPluginApi());
         return;
       }
     }
-
     synchronized (beanLoader) {
       // Lazy loading using LoadBeanContext which supports batch loading
       // Synchronise on the beanLoader (a 'node' of the LoadBeanContext 'tree')
@@ -844,32 +826,24 @@ public final class EntityBeanIntercept implements Serializable {
    * Invoke the lazy loading. This method is synchronised externally.
    */
   private void loadBeanInternal(int loadProperty, BeanLoader loader) {
-
     if ((flags[loadProperty] & FLAG_LOADED_PROP) != 0) {
       // race condition where multiple threads calling preGetter concurrently
       return;
     }
-
     if (lazyLoadFailure) {
       // failed when batch lazy loaded by another bean in the batch
       throw new EntityNotFoundException("(Lazy) loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted");
     }
-
     if (lazyLoadProperty == -1) {
-
       lazyLoadProperty = loadProperty;
-
       if (nodeUsageCollector != null) {
         nodeUsageCollector.setLoadProperty(getProperty(lazyLoadProperty));
       }
-
       loader.loadBean(this);
-
       if (lazyLoadFailure) {
         // failed when lazy loading this bean
         throw new EntityNotFoundException("Lazy loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted.");
       }
-
       // bean should be loaded and intercepting now. setLoaded() has
       // been called by the lazy loading mechanism
     }
@@ -879,32 +853,31 @@ public final class EntityBeanIntercept implements Serializable {
    * Helper method to check if two objects are equal.
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
-  protected boolean areEqual(Object obj1, Object obj2) {
+  protected static boolean notEqual(Object obj1, Object obj2) {
     if (obj1 == null) {
-      return (obj2 == null);
+      return (obj2 != null);
     }
     if (obj2 == null) {
-      return false;
+      return true;
     }
     if (obj1 == obj2) {
-      return true;
+      return false;
     }
     if (obj1 instanceof BigDecimal) {
       // Use comparable for BigDecimal as equals
       // uses scale in comparison...
       if (obj2 instanceof BigDecimal) {
         Comparable com1 = (Comparable) obj1;
-        return (com1.compareTo(obj2) == 0);
-
+        return (com1.compareTo(obj2) != 0);
       } else {
-        return false;
+        return true;
       }
     }
     if (obj1 instanceof URL) {
       // use the string format to determine if dirty
-      return obj1.toString().equals(obj2.toString());
+      return !obj1.toString().equals(obj2.toString());
     }
-    return obj1.equals(obj2);
+    return !obj1.equals(obj2);
   }
 
   /**
@@ -915,6 +888,7 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   private void preGetterCallback(int propertyIndex) {
+    PreGetterCallback preGetterCallback = this.preGetterCallback;
     if (preGetterCallback != null) {
       preGetterCallback.preGetterTrigger(propertyIndex);
     }
@@ -944,25 +918,20 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   /**
-   * OneToMany and ManyToMany don't have any interception so just check for
-   * PropertyChangeSupport.
+   * OneToMany and ManyToMany only set loaded state.
    */
   public void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) {
-
     if (readOnly) {
       throw new IllegalStateException("This bean is readOnly");
     }
-
     setLoadedProperty(propertyIndex);
   }
 
   private void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) {
-
     if (readOnly) {
       throw new IllegalStateException("This bean is readOnly");
     }
     setChangedProperty(propertyIndex);
-
     if (setDirtyState) {
       setOriginalValue(propertyIndex, origValue);
       setDirtyStatus();
@@ -987,10 +956,9 @@ public final class EntityBeanIntercept implements Serializable {
    * the old values for use with ConcurrencyMode.ALL.
    */
   public void preSetter(boolean intercept, int propertyIndex, Object oldValue, Object newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
-    } else if (!areEqual(oldValue, newValue)) {
+    } else if (notEqual(oldValue, newValue)) {
       setChangedPropertyValue(propertyIndex, intercept, oldValue);
     }
   }
@@ -1000,7 +968,6 @@ public final class EntityBeanIntercept implements Serializable {
    * Check for primitive boolean.
    */
   public void preSetter(boolean intercept, int propertyIndex, boolean oldValue, boolean newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (oldValue != newValue) {
@@ -1012,7 +979,6 @@ public final class EntityBeanIntercept implements Serializable {
    * Check for primitive int.
    */
   public void preSetter(boolean intercept, int propertyIndex, int oldValue, int newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (oldValue != newValue) {
@@ -1024,7 +990,6 @@ public final class EntityBeanIntercept implements Serializable {
    * long.
    */
   public void preSetter(boolean intercept, int propertyIndex, long oldValue, long newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (oldValue != newValue) {
@@ -1036,7 +1001,6 @@ public final class EntityBeanIntercept implements Serializable {
    * double.
    */
   public void preSetter(boolean intercept, int propertyIndex, double oldValue, double newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (Double.compare(oldValue, newValue) != 0) {
@@ -1048,7 +1012,6 @@ public final class EntityBeanIntercept implements Serializable {
    * float.
    */
   public void preSetter(boolean intercept, int propertyIndex, float oldValue, float newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (Float.compare(oldValue, newValue) != 0) {
@@ -1060,7 +1023,6 @@ public final class EntityBeanIntercept implements Serializable {
    * short.
    */
   public void preSetter(boolean intercept, int propertyIndex, short oldValue, short newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (oldValue != newValue) {
@@ -1072,7 +1034,6 @@ public final class EntityBeanIntercept implements Serializable {
    * char.
    */
   public void preSetter(boolean intercept, int propertyIndex, char oldValue, char newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (oldValue != newValue) {
@@ -1084,7 +1045,6 @@ public final class EntityBeanIntercept implements Serializable {
    * byte.
    */
   public void preSetter(boolean intercept, int propertyIndex, byte oldValue, byte newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (oldValue != newValue) {
@@ -1096,7 +1056,6 @@ public final class EntityBeanIntercept implements Serializable {
    * char[].
    */
   public void preSetter(boolean intercept, int propertyIndex, char[] oldValue, char[] newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (!Arrays.equals(oldValue, newValue)) {
@@ -1108,7 +1067,6 @@ public final class EntityBeanIntercept implements Serializable {
    * byte[].
    */
   public void preSetter(boolean intercept, int propertyIndex, byte[] oldValue, byte[] newValue) {
-
     if (state == STATE_NEW) {
       setLoadedProperty(propertyIndex);
     } else if (!Arrays.equals(oldValue, newValue)) {
@@ -1139,6 +1097,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/bean/SingleBeanLoader.java

@@ -0,0 +1,48 @@
+package io.ebean.bean;
+
+import io.ebean.Database;
+
+/**
+ * BeanLoader used when single beans are loaded (which is usually not ideal / N+1).
+ */
+public abstract class SingleBeanLoader implements BeanLoader {
+
+  protected final Database database;
+
+  SingleBeanLoader(Database database) {
+    this.database = database;
+  }
+
+  @Override
+  public String getName() {
+    return database.getName();
+  }
+
+  /**
+   * Single bean lazy loaded when bean from L2 cache.
+   */
+  public static class L2 extends SingleBeanLoader {
+    public L2(Database database) {
+      super(database);
+    }
+
+    @Override
+    public void loadBean(EntityBeanIntercept ebi) {
+      database.getPluginApi().loadBeanL2(ebi);
+    }
+  }
+
+  /**
+   * Single bean lazy loaded when a reference bean.
+   */
+  public static class Ref extends SingleBeanLoader {
+    public Ref(Database database) {
+      super(database);
+    }
+
+    @Override
+    public void loadBean(EntityBeanIntercept ebi) {
+      database.getPluginApi().loadBeanRef(ebi);
+    }
+  }
+}

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/DocStoreConfig.java

@@ -29,7 +29,7 @@ public class DocStoreConfig {
   protected boolean create;
 
   /**
-   * The URL of the Document store server. For example: http://localhost:9200.
+   * The URL of the Document store. For example: http://localhost:9200.
    */
   protected String url;
 
@@ -131,7 +131,7 @@ public class DocStoreConfig {
   }
 
   /**
-   * Set the URL to the Document store server.
+   * Set the URL to the Document store.
    * <p>
    * For a local ElasticSearch server this would be: http://localhost:9200
    */

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/ServerConfig.java

@@ -1,6 +1,7 @@
 package io.ebean.config;
 
 import com.fasterxml.jackson.core.JsonFactory;
+import io.avaje.config.Config;
 import io.ebean.DatabaseFactory;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
@@ -13,7 +14,6 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
@@ -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).
@@ -1740,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>
@@ -1886,7 +1846,7 @@ public class ServerConfig {
   }
 
   /**
-   * Return the database platform to use for this server.
+   * Return the database platform to use for this database.
    */
   public DatabasePlatform getDatabasePlatform() {
     return databasePlatform;
@@ -2282,7 +2242,7 @@ public class ServerConfig {
    * </p>
    *
    * @param cls the entity type (or other type) that should be registered by this
-   *            server.
+   *            database.
    */
   public void addClass(Class<?> cls) {
     classes.add(cls);
@@ -2329,7 +2289,7 @@ public class ServerConfig {
 
   /**
    * Set the list of classes (entities, listeners, scalarTypes etc) that should
-   * be used for this server.
+   * be used for this database.
    * <p>
    * If no classes are specified then the classes are found automatically via
    * searching the class path.
@@ -2343,7 +2303,7 @@ public class ServerConfig {
   }
 
   /**
-   * Return the classes registered for this server. Typically this includes
+   * Return the classes registered for this database. Typically this includes
    * entities and perhaps listeners.
    */
   public List<Class<?>> getClasses() {
@@ -2746,7 +2706,7 @@ public class ServerConfig {
    * Load settings from ebean.properties.
    */
   public void loadFromProperties() {
-    this.properties = PropertiesLoader.load();
+    this.properties = Config.asProperties();
     configureFromProperties();
   }
 
@@ -2755,7 +2715,7 @@ public class ServerConfig {
    */
   public void loadFromProperties(Properties properties) {
     // keep the properties used for configuration so that these are available for plugins
-    this.properties = PropertiesLoader.eval(properties);
+    this.properties = Config.asConfiguration().eval(properties);
     configureFromProperties();
   }
 
@@ -2799,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");
   }
 
   /**
@@ -2860,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);
@@ -3100,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
    */
@@ -3298,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

@@ -146,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
@@ -278,7 +278,7 @@ public class DatabasePlatform {
    * Return true if this matches the given platform.
    */
   public boolean isPlatform(Platform platform) {
-    return this.platform == platform;
+    return this.platform.base() == platform;
   }
 
   /**

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/IdType.java

@@ -35,6 +35,11 @@ public enum IdType {
    * Used when the key is a compound key or lookup table code.
    * </p>
    */
-  EXTERNAL
+  EXTERNAL,
+
+  /**
+   * Auto mapping to platform preferred identity strategy.
+   */
+  AUTO
 
 }

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

@@ -40,8 +40,7 @@ public class LimitOffsetSqlLimiter implements SqlLimiter {
     }
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sql);
   }
 
 }

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

@@ -1,75 +0,0 @@
-package io.ebean.config.dbplatform;
-
-/**
- * Adds the ROW_NUMBER() OVER function to a query.
- */
-public class RowNumberSqlLimiter implements SqlLimiter {
-
-  /**
-   * ROW_NUMBER() OVER (ORDER BY
-   */
-  private static final String ROW_NUMBER_OVER = "row_number() over (order by ";
-
-  /**
-   * ) as rn,
-   */
-  private static final String ROW_NUMBER_AS = ") as rn, ";
-
-  private final String rowNumberWindowAlias;
-
-  /**
-   * Specify the name of the rowNumberWindowAlias.
-   */
-  public RowNumberSqlLimiter(String rowNumberWindowAlias) {
-    this.rowNumberWindowAlias = rowNumberWindowAlias;
-  }
-
-  public RowNumberSqlLimiter() {
-    this("as limitresult");
-  }
-
-  @Override
-  public SqlLimitResponse limit(SqlLimitRequest request) {
-
-    String dbSql = request.getDbSql();
-
-    StringBuilder sb = new StringBuilder(60 + dbSql.length());
-
-    int firstRow = request.getFirstRow();
-
-    int lastRow = request.getMaxRows();
-    if (lastRow > 0) {
-      lastRow += firstRow;
-    }
-
-    sb.append("select * from ( ");
-
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-
-    sb.append(ROW_NUMBER_OVER);
-    sb.append(request.getDbOrderBy());
-    sb.append(ROW_NUMBER_AS);
-
-    sb.append(dbSql);
-
-    sb.append(" ) ");
-    sb.append(rowNumberWindowAlias);
-    sb.append(" where ");
-    if (firstRow > 0) {
-      sb.append(" rn > ").append(firstRow);
-      if (lastRow > 0) {
-        sb.append(" and ");
-      }
-    }
-    if (lastRow > 0) {
-      sb.append(" rn <= ").append(lastRow);
-    }
-
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, true);
-  }
-}

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

@@ -1,81 +0,0 @@
-package io.ebean.config.dbplatform;
-
-/**
- * Add ROWNUM column etc around SQL query to limit results.
- */
-public class RownumSqlLimiter implements SqlLimiter {
-
-  private final String rnum;
-
-  private final boolean useFirstRowsHint;
-
-  /**
-   * Create with default inner rownum column alias and used FIRST_ROWS hint.
-   */
-  public RownumSqlLimiter() {
-    this("rn_", true);
-  }
-
-  /**
-   * Specify the inner rownum column alias and whether to include the FIRST_ROWS
-   * hint.
-   */
-  public RownumSqlLimiter(String rnum, boolean useFirstRowsHint) {
-    this.rnum = rnum;
-    this.useFirstRowsHint = useFirstRowsHint;
-  }
-
-  @Override
-  public SqlLimitResponse limit(SqlLimitRequest request) {
-
-    // select *
-    // from ( select /*+ FIRST_ROWS(n) */ ROWNUM rnum, a.*
-    // from ( your_query_goes_here,
-    // with order by ) a
-    // where ROWNUM <=
-    // :MAX_ROW_TO_FETCH )
-    // where rnum >= :MIN_ROW_TO_FETCH;
-
-    String dbSql = request.getDbSql();
-
-    StringBuilder sb = new StringBuilder(60 + dbSql.length());
-
-    int firstRow = request.getFirstRow();
-
-    int lastRow = request.getMaxRows();
-    if (lastRow > 0) {
-      lastRow += firstRow;
-    }
-
-    sb.append("select * from ( ");
-
-    sb.append("select ");
-    if (useFirstRowsHint && request.getMaxRows() > 0) {
-      sb.append("/*+ FIRST_ROWS(").append(request.getMaxRows()).append(") */ ");
-    }
-
-    sb.append("rownum ").append(rnum).append(", a.* ");
-    sb.append(" from (");
-
-    sb.append(" select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append(dbSql);
-
-    sb.append(NEW_LINE).append("  ) a ");
-    if (lastRow > 0) {
-      sb.append(" where rownum <= ").append(lastRow);
-    }
-    sb.append(" ) ");
-    if (firstRow > 0) {
-      sb.append(" where ");
-      sb.append(rnum).append(" > ").append(firstRow);
-    }
-
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, true);
-  }
-
-}

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

@@ -7,14 +7,11 @@ public class SqlLimitResponse {
 
   final String sql;
 
-  final boolean includesRowNumberColumn;
-
   /**
    * Create the response.
    */
-  public SqlLimitResponse(String sql, boolean includesRowNumberColumn) {
+  public SqlLimitResponse(String sql) {
     this.sql = sql;
-    this.includesRowNumberColumn = includesRowNumberColumn;
   }
 
   /**
@@ -24,11 +21,4 @@ public class SqlLimitResponse {
     return sql;
   }
 
-  /**
-   * Returns true if a ROW_NUMBER column is used in the query.
-   */
-  public boolean isIncludesRowNumberColumn() {
-    return includesRowNumberColumn;
-  }
-
 }

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;
   }
 

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

@@ -22,6 +22,6 @@ public class Db2SqlLimiter implements SqlLimiter {
     }
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sql);
   }
 }

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")

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/hana/HanaSqlLimiter.java

@@ -29,7 +29,6 @@ public class HanaSqlLimiter implements SqlLimiter {
     }
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sql);
   }
-}
+}

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 + ".row_start";
+    }
+
+    /**
+     * Returns the SQL Server specific effective end column.
+     */
+    @Override
+    public String getSysPeriodUpper(String tableAlias, String sysPeriod) {
+        return tableAlias + ".row_end";
+    }
+}

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 = ...

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

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

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

@@ -0,0 +1,34 @@
+package io.ebean.config.dbplatform.oracle;
+
+import io.ebean.config.dbplatform.SqlLimitRequest;
+import io.ebean.config.dbplatform.SqlLimitResponse;
+import io.ebean.config.dbplatform.SqlLimiter;
+
+/**
+ * Use ANSI offset rows syntax.
+ */
+class OracleAnsiSqlRowsLimiter implements SqlLimiter {
+
+  @Override
+  public SqlLimitResponse limit(SqlLimitRequest request) {
+
+    String dbSql = request.getDbSql();
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
+    int firstRow = request.getFirstRow();
+    int maxRows = request.getMaxRows();
+
+    sb.append("select ");
+    if (request.isDistinct()) {
+      sb.append("distinct ");
+    }
+    sb.append(dbSql);
+    if (firstRow > 0) {
+      sb.append(" offset ").append(firstRow).append(" rows");
+    }
+    if (maxRows > 0) {
+      sb.append(" fetch next ").append(maxRows).append(" rows only");
+    }
+    return new SqlLimitResponse(sb.toString());
+  }
+
+}

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

@@ -9,7 +9,6 @@ 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.RownumSqlLimiter;
 import io.ebean.config.dbplatform.SqlErrorCodes;
 
 import javax.sql.DataSource;
@@ -27,11 +26,11 @@ public class OraclePlatform extends DatabasePlatform {
     this.maxTableNameLength = 30;
     this.maxConstraintNameLength = 30;
     this.dbEncrypt = new OracleDbEncrypt();
-    this.sqlLimiter = new RownumSqlLimiter();
+    this.sqlLimiter = new OracleAnsiSqlRowsLimiter();
     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"));

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

@@ -0,0 +1,54 @@
+package io.ebean.config.dbplatform.oracle;
+
+import io.ebean.config.dbplatform.SqlLimitRequest;
+import io.ebean.config.dbplatform.SqlLimitResponse;
+import io.ebean.config.dbplatform.SqlLimiter;
+
+/**
+ * Add ROWNUM column etc around SQL query to limit results.
+ */
+class OracleRownumSqlLimiter implements SqlLimiter {
+
+  @Override
+  public SqlLimitResponse limit(SqlLimitRequest request) {
+
+    // select *
+    // from ( select /*+ FIRST_ROWS(n) */ a.*, ROWNUM rnum
+    // from ( your_query_goes_here,
+    // with order by ) a
+    // where ROWNUM <=
+    // :MAX_ROW_TO_FETCH )
+    // where rnum >= :MIN_ROW_TO_FETCH;
+
+    String dbSql = request.getDbSql();
+
+    StringBuilder sb = new StringBuilder(60 + dbSql.length());
+    int firstRow = request.getFirstRow();
+    int lastRow = request.getMaxRows();
+    if (lastRow > 0) {
+      lastRow += firstRow;
+    }
+
+    sb.append("select * from (select ");
+    if (request.getMaxRows() > 0) {
+      sb.append("/*+ FIRST_ROWS(").append(request.getMaxRows()).append(") */ ");
+    }
+
+    sb.append("a.*, rownum rn_ from (select ");
+    if (request.isDistinct()) {
+      sb.append("distinct ");
+    }
+    sb.append(dbSql).append(") a ");
+    if (lastRow > 0) {
+      sb.append(" where rownum <= ").append(lastRow);
+    }
+    sb.append(") ");
+    if (firstRow > 0) {
+      sb.append(" where rn_ > ").append(firstRow);
+    }
+
+    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
+    return new SqlLimitResponse(sql);
+  }
+
+}

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

@@ -1,20 +0,0 @@
-package io.ebean.config.dbplatform.postgres;
-
-import io.ebean.config.dbplatform.IdType;
-
-/**
- * Postgres v8.3 specific platform.
- * <p>
- * No support for getGeneratedKeys.
- * </p>
- */
-public class Postgres8Platform extends PostgresPlatform {
-
-  public Postgres8Platform() {
-    super();
-    this.dbIdentity.setSupportsGetGeneratedKeys(false);
-    this.dbIdentity.setIdType(IdType.SEQUENCE);
-    this.columnAliasPrefix = "as c";
-  }
-
-}

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

@@ -0,0 +1,14 @@
+package io.ebean.config.dbplatform.postgres;
+
+import io.ebean.annotation.Platform;
+
+/**
+ * Postgres9 platform - uses serial type for identity columns.
+ */
+public class Postgres9Platform extends PostgresPlatform {
+
+  public Postgres9Platform() {
+    super();
+    this.platform = Platform.POSTGRES9;
+  }
+}

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

@@ -19,10 +19,9 @@ import java.sql.SQLException;
 import java.sql.Types;
 
 /**
- * Postgres v9 specific platform.
+ * Postgres 10+ platform.
  * <p>
- * Uses serial types and getGeneratedKeys.
- * </p>
+ * Defaults to use "generated by default as identity".
  */
 public class PostgresPlatform extends DatabasePlatform {
 
@@ -35,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();
@@ -72,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);

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

@@ -35,8 +35,7 @@ public class SqlAnywhereLimiter implements SqlLimiter {
     sb.append(dbSql);
 
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sql);
   }
 
 }

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/SqlServer2005Platform.java

@@ -1,11 +0,0 @@
-package io.ebean.config.dbplatform.sqlserver;
-
-/**
- * SQL Server platform using the older ROW_NUMBER() mechanism.
- */
-public class SqlServer2005Platform extends SqlServer16Platform {
-
-  public SqlServer2005Platform() {
-    this.sqlLimiter = new SqlServer2005SqlLimiter();
-  }
-}

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

@@ -1,79 +0,0 @@
-package io.ebean.config.dbplatform.sqlserver;
-
-import io.ebean.config.dbplatform.SqlLimitRequest;
-import io.ebean.config.dbplatform.SqlLimitResponse;
-import io.ebean.config.dbplatform.SqlLimiter;
-
-/**
- * Use top and row_number() function to limit sql results.
- */
-public class SqlServer2005SqlLimiter implements SqlLimiter {
-
-  final String rowNumberWindowAlias;
-
-  /**
-   * Specify the name of the rowNumberWindowAlias.
-   */
-  public SqlServer2005SqlLimiter(String rowNumberWindowAlias) {
-    this.rowNumberWindowAlias = rowNumberWindowAlias;
-  }
-
-  public SqlServer2005SqlLimiter() {
-    this("as limitresult");
-  }
-
-  @Override
-  public SqlLimitResponse limit(SqlLimitRequest request) {
-
-    StringBuilder sb = new StringBuilder(500);
-
-    int firstRow = request.getFirstRow();
-
-    int lastRow = request.getMaxRows();
-    if (lastRow > 0) {
-      lastRow += firstRow;
-    }
-
-    if (firstRow < 1) {
-      // just use top n
-      sb.append("select ");
-      if (request.isDistinct()) {
-        sb.append("distinct ");
-      }
-      sb.append("top ").append(lastRow).append(" ");
-      sb.append(request.getDbSql());
-      return new SqlLimitResponse(sb.toString(), false);
-    }
-
-    /*
-     * SELECT * FROM (SELECT TOP 20 ROW_NUMBER() OVER (ORDER BY ...) AS rn, ...)
-     * AS limitresult WHERE rn >= 11 AND rn <= 20
-     */
-
-    sb.append("select * ").append(NEW_LINE).append("from ( ");
-
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append("top ").append(lastRow);
-    sb.append(" row_number() over (order by ");
-    sb.append(request.getDbOrderBy());
-    sb.append(") as rn, ");
-    sb.append(request.getDbSql());
-
-    sb.append(NEW_LINE).append(") ");
-    sb.append(rowNumberWindowAlias);
-    sb.append(" where ");
-    sb.append(" rn > ").append(firstRow);
-    if (lastRow > 0) {
-      sb.append(" and ");
-      sb.append(" rn <= ").append(lastRow);
-    }
-
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, true);
-  }
-
-}

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

@@ -62,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"));

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

@@ -29,7 +29,7 @@ public class SqlServerSqlLimiter implements SqlLimiter {
       }
       sb.append("top ").append(maxRows).append(" ");
       sb.append(dbSql);
-      return new SqlLimitResponse(sb.toString(), false);
+      return new SqlLimitResponse(sb.toString());
     }
 
     sb.append("select ");
@@ -43,8 +43,7 @@ public class SqlServerSqlLimiter implements SqlLimiter {
     if (maxRows > 0) {
       sb.append(" fetch next ").append(maxRows).append(" rows only");
     }
-    String sql = sb.toString();
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sb.toString());
   }
 
 }

src/main/java/io/ebean/config/properties/LoadContext.java

@@ -1,106 +0,0 @@
-package io.ebean.config.properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * Manages the underlying map of properties we are gathering.
- */
-class LoadContext {
-
-  private static final Logger log = LoggerFactory.getLogger(LoadContext.class);
-
-  /**
-   * Map we are loading the properties into.
-   */
-  private final Map<String, String> map = new LinkedHashMap<>();
-
-  /**
-   * Names of resources/files that were loaded.
-   */
-  private final Set<String> loadedResources = new LinkedHashSet<>();
-
-  /**
-   * Return the input stream (maybe null) for the given source.
-   */
-  InputStream resource(String resourcePath, Loader.Source source) {
-
-    InputStream is = null;
-    if (source == Loader.Source.RESOURCE) {
-      is = resourceStream(resourcePath);
-      if (is != null) {
-        loadedResources.add(resourcePath);
-      }
-    } else {
-      File file = new File(resourcePath);
-      if (file.exists()) {
-        try {
-          is = new FileInputStream(file);
-          loadedResources.add("file:" + resourcePath);
-        } catch (FileNotFoundException e) {
-          throw new IllegalStateException(e);
-        }
-      }
-    }
-
-    return is;
-  }
-
-  private InputStream resourceStream(String resourcePath) {
-    InputStream is = getClass().getResourceAsStream("/" + resourcePath);
-    if (is == null) {
-      // search the module path for top level resource
-      is = ClassLoader.getSystemResourceAsStream(resourcePath);
-    }
-    return is;
-  }
-
-  /**
-   * Add a property entry.
-   */
-  void put(String key, String val) {
-    if (val != null) {
-      val = val.trim();
-    }
-    map.put(key, val);
-  }
-
-  /**
-   * Evaluate all the expressions and return as a Properties object.
-   */
-  Properties eval() {
-
-    log.info("loaded properties from {}", loadedResources);
-
-    Properties properties = new Properties();
-
-    for (Map.Entry<String, String> entry : map.entrySet()) {
-      String key = entry.getKey();
-      String value = PropertyEval.eval(entry.getValue());
-      properties.setProperty(key, value);
-    }
-
-    return properties;
-  }
-
-  /**
-   * Read the special properties that can point to an external properties source.
-   */
-  String indirectLocation() {
-    String indirectLocation = map.get("load.properties");
-    if (indirectLocation == null) {
-      indirectLocation = map.get("load.properties.override");
-    }
-    return indirectLocation;
-  }
-}

src/main/java/io/ebean/config/properties/Loader.java

@@ -1,181 +0,0 @@
-package io.ebean.config.properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Properties;
-
-/**
- * Loads the configuration from known/expected locations.
- * <p>
- * Defines the loading order of resources and files.
- * </p>
- */
-class Loader {
-
-  private static final Logger log = LoggerFactory.getLogger(Loader.class);
-
-  enum Source {
-    RESOURCE,
-    FILE
-  }
-
-  private final LoadContext loadContext = new LoadContext();
-
-  private YamlLoader yamlLoader;
-
-  Loader() {
-    String skipYaml = System.getProperty("ebeanSkipYaml");
-    if (!"true".equals(skipYaml)) {
-      try {
-        Class<?> exists = Class.forName("org.yaml.snakeyaml.Yaml");
-        if (exists != null) {
-          yamlLoader = new YamlLoader(loadContext);
-        }
-      } catch (Exception e) {
-        // ignored
-      }
-    }
-  }
-
-  /**
-   * Load the configuration with the expected ordering.
-   */
-  void load() {
-
-    loadMain(Source.RESOURCE);
-    // external file configuration overrides the resources configuration
-    loadMain(Source.FILE);
-
-    loadViaSystemProperty();
-    loadViaIndirection();
-
-    // test configuration (if found) overrides main configuration
-    // we should only find these resources when running tests
-    loadTest();
-  }
-
-  /**
-   * Load test configuration.
-   */
-  private void loadTest() {
-    loadProperties("application-test.properties", Source.RESOURCE);
-    loadYaml("application-test.yaml", Source.RESOURCE);
-    loadYaml("application-test.yml", Source.RESOURCE);
-    loadProperties("test-ebean.properties", Source.RESOURCE);
-  }
-
-  /**
-   * Load configuration defined by a <em>load.properties</em> entry in properties file.
-   */
-  private void loadViaIndirection() {
-
-    String location = loadContext.indirectLocation();
-    if (location != null) {
-      location = PropertyEval.eval(location);
-      loadWithExtensionCheck(location);
-    }
-  }
-
-  /**
-   * Load the main configuration for the given source.
-   */
-  private void loadMain(Source source) {
-    loadYaml("application.yaml", source);
-    loadYaml("application.yml", source);
-    loadProperties("application.properties", source);
-    loadProperties("ebean.properties", source);
-  }
-
-  private void loadViaSystemProperty() {
-    String fileName = System.getenv("EBEAN_PROPS_FILE");
-    if (fileName == null) {
-      fileName = System.getProperty("ebean.props.file");
-      if (fileName != null) {
-        loadWithExtensionCheck(fileName);
-      }
-    } else {
-        loadWithExtensionCheck(fileName);
-    }
-  }
-
-  void loadWithExtensionCheck(String fileName) {
-    if (fileName.endsWith("yaml") || fileName.endsWith("yml")) {
-      loadYaml(fileName, Source.FILE);
-    } else if (fileName.endsWith("properties")) {
-      loadProperties(fileName, Source.FILE);
-    } else {
-      throw new IllegalArgumentException("Expecting only yml or properties file but got [" + fileName + "]");
-    }
-  }
-
-  /**
-   * Evaluate all the configuration entries and return as properties.
-   */
-  Properties eval() {
-    return loadContext.eval();
-  }
-
-  void loadYaml(String resourcePath, Source source) {
-    if (yamlLoader != null) {
-      try {
-        try (InputStream is = resource(resourcePath, source)) {
-          yamlLoader.load(is);
-        }
-      } catch (Exception e) {
-        log.warn("Failed to read yml from:" + resourcePath, e);
-      }
-    }
-  }
-
-  void loadProperties(String resourcePath, Source source) {
-    try {
-      try (InputStream is = resource(resourcePath, source)) {
-        if (is != null) {
-          loadProperties(is);
-        }
-      }
-    } catch (Exception e) {
-      log.warn("Failed to read properties from:" + resourcePath, e);
-    }
-  }
-
-  private InputStream resource(String resourcePath, Source source) {
-    return loadContext.resource(resourcePath, source);
-  }
-
-  private void loadProperties(InputStream is) {
-
-    if (is != null) {
-      try {
-        Properties properties = new Properties();
-        properties.load(is);
-        put(properties);
-      } catch (IOException e) {
-        throw new RuntimeException("Failed to load properties?", e);
-      } finally {
-        close(is);
-      }
-    }
-  }
-
-  private void put(Properties properties) {
-    Enumeration<?> enumeration = properties.propertyNames();
-    while (enumeration.hasMoreElements()) {
-      String key = (String) enumeration.nextElement();
-      String property = properties.getProperty(key);
-      loadContext.put(key, property);
-    }
-  }
-
-  private void close(InputStream is) {
-    try {
-      is.close();
-    } catch (IOException e) {
-      log.warn("Error closing input stream for properties", e);
-    }
-  }
-}

src/main/java/io/ebean/config/properties/PropertiesLoader.java

@@ -1,74 +0,0 @@
-package io.ebean.config.properties;
-
-import java.util.Enumeration;
-import java.util.Properties;
-
-/**
- * Loads and evaluates properties and yml configuration.
- */
-public class PropertiesLoader {
-
-  private static Properties properties;
-
-  /**
-   * Provides properties by reading known locations.
-   * <p>
-   * <h3>Main configuration</h3>
-   * <p>
-   * <p>Firstly loads from main resources</p>
-   * <pre>
-   *   - application.properties
-   *   - application.yaml
-   *   - ebean.properties
-   * </pre>
-   * <p>
-   * <p>Then loads from local files</p>
-   * <pre>
-   *   - application.properties
-   *   - application.yaml
-   *   - ebean.properties
-   * </pre>
-   * <p>
-   * <p>Then loads from environment variable <em>EBEAN_PROPS_FILE</em></p>
-   * <p>Then loads from system property <em>ebean.props.file</em></p>
-   * <p>Then loads from <em>load.properties</em></p>
-   * <p>
-   * <h3>Test configuration</h3>
-   * <p>
-   * Once the main configuration is read it will try to read common test configuration.
-   * This will only be successful if the test resources are available (i.e. running tests).
-   * </p>
-   * <p>Loads from test resources</p>
-   * <pre>
-   *   - application-test.properties
-   *   - application-test.yaml
-   *   - test-ebean.properties
-   * </pre>
-   */
-  public static synchronized Properties load() {
-
-    if (properties == null) {
-      Loader loader = new Loader();
-      loader.load();
-      properties = loader.eval();
-    }
-
-    return properties;
-  }
-
-  /**
-   * Return a copy of the properties with 'eval' run on all the values.
-   * This resolves expressions like ${HOME} etc.
-   */
-  public static Properties eval(Properties properties) {
-    Properties evalCopy = new Properties();
-
-    Enumeration<?> names = properties.propertyNames();
-    while (names.hasMoreElements()) {
-      String name = (String)names.nextElement();
-      String value = PropertyEval.eval(properties.getProperty(name));
-      evalCopy.setProperty(name, value);
-    }
-    return evalCopy;
-  }
-}

src/main/java/io/ebean/config/properties/PropertyEval.java

@@ -1,205 +0,0 @@
-package io.ebean.config.properties;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * Helper used to evaluate expressions such as ${CATALINA_HOME}.
- * <p>
- * The expressions can contain environment variables, system properties or JNDI
- * properties. JNDI expressions take the form ${jndi:propertyName} where you
- * substitute propertyName with the name of the jndi property you wish to
- * evaluate.
- * </p>
- */
-final class PropertyEval {
-
-  /**
-   * Prefix for looking up JNDI Environment variable.
-   */
-  private static final String JAVA_COMP_ENV = "java:comp/env/";
-
-  /**
-   * Used to detect the start of an expression.
-   */
-  private static final String START = "${";
-
-  /**
-   * Used to detect the end of an expression.
-   */
-  private static final String END = "}";
-
-  /**
-   * Specify the PropertyHolder.
-   */
-  private PropertyEval() {
-  }
-
-  /**
-   * Return the property value evaluating and replacing any expressions such as
-   * ${CATALINA_HOME}.
-   */
-  static String eval(String val) {
-    if (val == null) {
-      return null;
-    }
-    int sp = val.indexOf(START);
-    if (sp > -1) {
-      int ep = val.indexOf(END, sp + 1);
-      if (ep > -1) {
-        return eval(val, sp, ep);
-      }
-    }
-    return val;
-  }
-
-  /**
-   * Convert the expression using JNDI, Environment variables, System Properties
-   * or existing an property in SystemProperties itself.
-   */
-  private static String evaluateExpression(String exp) {
-
-    if (exp.isEmpty()) {
-      return null;
-    }
-    if (isJndiExpression(exp)) {
-      // JNDI property lookup...
-      String val = getJndiProperty(exp);
-      if (val != null) {
-        return val;
-      }
-    }
-    String val = System.getProperty(exp);
-    if (val == null) {
-      val = System.getenv(exp);
-    }
-    return val;
-  }
-
-  private static String eval(String val, int sp, int ep) {
-
-    return new EvalBuffer(val, sp, ep).process();
-  }
-
-
-  private static boolean isJndiExpression(String exp) {
-    return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
-  }
-
-  /**
-   * Returns null if JNDI is not setup or if the property is not found.
-   *
-   * @param key the key of the JNDI Environment property including a JNDI: prefix.
-   */
-  private static String getJndiProperty(String key) {
-
-    try {
-      // remove the JNDI: prefix
-      key = key.substring(5);
-      return (String) getJndiObject(key);
-    } catch (NamingException ex) {
-      return null;
-    }
-  }
-
-  /**
-   * Similar to getProperty but throws NamingException if JNDI is not setup or
-   * if the property is not found.
-   */
-  private static Object getJndiObject(String key) throws NamingException {
-
-    InitialContext ctx = new InitialContext();
-    return ctx.lookup(JAVA_COMP_ENV + key);
-  }
-
-
-  private static class EvalBuffer {
-
-    private final StringBuilder buf = new StringBuilder();
-    private final String original;
-    private int position;
-    private int start;
-    private int end;
-
-    private String expression;
-    private String defaultValue;
-
-    EvalBuffer(String val, int start, int ep) {
-      this.original = val;
-      this.start = start;
-      this.end = ep;
-      this.position = 0;
-      moveToStart();
-    }
-
-    void moveToStart() {
-      if (start > position) {
-        buf.append(original.substring(position, start));
-        position = start;
-      }
-    }
-
-    void parseForDefault() {
-      int colonPos = original.lastIndexOf(':', end);
-      if (colonPos > start) {
-        expression = original.substring(start + START.length(), colonPos);
-        defaultValue = original.substring(colonPos + 1, end);
-      } else {
-        expression = original.substring(start + START.length(), end);
-      }
-    }
-
-    void evaluate() {
-      String eval = evaluateExpression(expression);
-      if (eval != null) {
-        buf.append(eval);
-      } else {
-        if (defaultValue != null) {
-          buf.append(defaultValue);
-        } else {
-          buf.append(START).append(expression).append(END);
-        }
-      }
-    }
-
-    String end() {
-      if (end < original.length() - 1) {
-        buf.append(original.substring(end + 1));
-      }
-      return buf.toString();
-    }
-
-    boolean next() {
-      if (end < original.length()) {
-        int startPos = original.indexOf(START, end + 1);
-        if (startPos > -1) {
-          int endPos = original.indexOf(END, startPos + 1);
-          if (endPos > -1) {
-            if (startPos > end + 1) {
-              buf.append(original.substring(end + 1, startPos));
-            }
-            this.start = startPos;
-            this.end = endPos;
-            return true;
-          }
-        }
-      }
-      return false;
-    }
-
-    private void evalNext() {
-      parseForDefault();
-      evaluate();
-    }
-
-    String process() {
-      evalNext();
-      while (next()) {
-        evalNext();
-      }
-      return end();
-    }
-
-  }
-
-}

src/main/java/io/ebean/config/properties/YamlLoader.java

@@ -1,58 +0,0 @@
-package io.ebean.config.properties;
-
-import org.yaml.snakeyaml.Yaml;
-
-import java.io.InputStream;
-import java.util.Map;
-
-/**
- * Loads configuration from Yml into the load context.
- * <p>
- * Note that this ignores 'lists' so just reads 'maps' and scalar values.
- * </p>
- */
-class YamlLoader {
-
-  private final Yaml yaml = new Yaml();
-
-  private final LoadContext loadContext;
-
-  YamlLoader(LoadContext loadContext) {
-    this.loadContext = loadContext;
-  }
-
-  @SuppressWarnings("unchecked")
-  void load(InputStream is) {
-    if (is != null) {
-      for (Object map : yaml.loadAll(is)) {
-        loadMap((Map<String, Object>)map, null);
-      }
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  void loadMap(Map<String, Object> map, String path) {
-
-    for (Map.Entry<String, Object> entry : map.entrySet()) {
-      String key = entry.getKey();
-      if (path != null) {
-        key = path + "." + key;
-      }
-      Object val = entry.getValue();
-      if (val instanceof Map) {
-        loadMap((Map<String, Object>) val, key);
-      } else  {
-        addScalar(key, val);
-      }
-    }
-  }
-
-  private void addScalar(String key, Object val) {
-    if (val instanceof String) {
-      loadContext.put(key, (String) val);
-    } else if (val instanceof Number || val instanceof Boolean) {
-      loadContext.put(key, val.toString());
-    }
-  }
-
-}

src/main/java/io/ebean/dbmigration/DbMigration.java

@@ -93,7 +93,7 @@ public interface DbMigration {
   /**
    * Set the specific platform to generate DDL for.
    * <p>
-   * If not set this defaults to the platform of the default server.
+   * If not set this defaults to the platform of the default database.
    * </p>
    */
   void setPlatform(Platform platform);
@@ -101,7 +101,7 @@ public interface DbMigration {
   /**
    * Set the specific platform to generate DDL for.
    * <p>
-   * If not set this defaults to the platform of the default server.
+   * If not set this defaults to the platform of the default database.
    * </p>
    */
   void setPlatform(DatabasePlatform databasePlatform);

src/main/java/io/ebean/event/BeanPersistController.java

@@ -15,8 +15,8 @@ package io.ebean.event;
  *
  *   Object extaBeanToSave = ...;
  *   Transaction t = request.getTransaction();
- *   EbeanServer server = request.getEbeanServer();
- *   server.save(extraBeanToSave, t);
+ *   Database server = request.getEbeanServer();
+ *   database.save(extraBeanToSave, t);
  *
  * }</pre>
  * <p>

src/main/java/io/ebean/meta/MetaMetric.java

@@ -5,11 +5,6 @@ package io.ebean.meta;
  */
 public interface MetaMetric {
 
-  /**
-   * Return the metric type.
-   */
-  MetricType getMetricType();
-
   /**
    * Return the metric name.
    */

src/main/java/io/ebean/meta/MetricData.java

@@ -6,7 +6,6 @@ package io.ebean.meta;
 public class MetricData {
 
   private String name;
-  private String type;
   private String hash;
   private String loc;
   private String sql;
@@ -16,9 +15,8 @@ public class MetricData {
   private Long max;
   private Long total;
 
-  public MetricData(String name, String type) {
+  public MetricData(String name) {
     this.name = name;
-    this.type = type;
   }
 
   public MetricData() {
@@ -32,14 +30,6 @@ public class MetricData {
     this.name = name;
   }
 
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
   public String getHash() {
     return hash;
   }

src/main/java/io/ebean/meta/MetricType.java

@@ -1,40 +0,0 @@
-package io.ebean.meta;
-
-/**
- * The type of Metric.
- */
-public enum MetricType {
-
-  /**
-   * Transactions.
-   */
-  TXN,
-
-  /**
-   * ORM Insert Update or Delete.
-   */
-  IUD,
-
-  /**
-   * ORM queries.
-   */
-  ORM,
-
-  /**
-   * DTO queries.
-   */
-  DTO,
-
-  /**
-   * SQL queries with a label will have metrics collected.
-   * <p>
-   * SqlQuery and SqlUpdate without a label have no metrics collected.
-   */
-  SQL,
-
-  /**
-   * L2 cache metrics.
-   */
-  L2
-
-}

src/main/java/io/ebean/metric/MetricFactory.java

@@ -1,7 +1,6 @@
 package io.ebean.metric;
 
 import io.ebean.ProfileLocation;
-import io.ebean.meta.MetricType;
 
 /**
  * Factory to create timed metric counters.
@@ -18,21 +17,21 @@ public interface MetricFactory {
   /**
    * Create a timed metric group.
    */
-  TimedMetricMap createTimedMetricMap(MetricType metricType, String name);
+  TimedMetricMap createTimedMetricMap(String name);
 
   /**
    * Create a Timed metric.
    */
-  TimedMetric createTimedMetric(MetricType metricType, String name);
+  TimedMetric createTimedMetric(String name);
 
   /**
    * Create a counter metric.
    */
-  CountMetric createCountMetric(MetricType metricType, String name);
+  CountMetric createCountMetric(String name);
 
   /**
    * Create a Timed metric.
    */
-  QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class<?> type, String label, ProfileLocation profileLocation, String sql);
+  QueryPlanMetric createQueryPlanMetric(Class<?> type, String label, ProfileLocation profileLocation, String sql);
 
 }

src/main/java/io/ebean/plugin/BeanType.java

@@ -8,12 +8,11 @@ import io.ebean.event.BeanPersistListener;
 import io.ebean.event.BeanQueryAdapter;
 import io.ebeanservice.docstore.api.mapping.DocumentMapping;
 
+import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Consumer;
 
-import javax.annotation.Nonnull;
-
 /**
  * Information and methods on BeanDescriptors made available to plugins.
  */
@@ -25,11 +24,6 @@ public interface BeanType<T> {
   @Nonnull
   String getName();
 
-  /**
-   * Return the profileId of the bean type.
-   */
-  short getProfileId();
-
   /**
    * Return the full name of the bean type.
    */
@@ -161,11 +155,6 @@ public interface BeanType<T> {
    */
   IdType getIdType();
 
-  /**
-   * Return the sequence name associated to this entity bean type (if there is one).
-   */
-  String getSequenceName();
-
   /**
    * Return true if this bean type has doc store backing.
    */

src/main/java/io/ebean/plugin/SpiServer.java

@@ -1,6 +1,8 @@
 package io.ebean.plugin;
 
 import io.ebean.EbeanServer;
+import io.ebean.bean.BeanLoader;
+import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 
@@ -10,7 +12,7 @@ import java.util.List;
 /**
  * Extensions to Database API made available to plugins.
  */
-public interface SpiServer extends EbeanServer {
+public interface SpiServer extends EbeanServer, BeanLoader {
 
   /**
    * Return the serverConfig.
@@ -18,7 +20,7 @@ public interface SpiServer extends EbeanServer {
   ServerConfig getServerConfig();
 
   /**
-   * Return the DatabasePlatform for this server.
+   * Return the DatabasePlatform for this database.
    */
   DatabasePlatform getDatabasePlatform();
 
@@ -52,4 +54,19 @@ public interface SpiServer extends EbeanServer {
    */
   DataSource getReadOnlyDataSource();
 
+  /**
+   * Invoke lazy loading on this single bean (reference bean).
+   */
+  void loadBeanRef(EntityBeanIntercept ebi);
+
+  /**
+   * Invoke lazy loading on this single bean (L2 cache bean).
+   */
+  void loadBeanL2(EntityBeanIntercept ebi);
+
+  /**
+   * Invoke lazy loading on this single bean when no BeanLoader is set.
+   * Typically due to serialisation or multiple stateless updates.
+   */
+  void loadBean(EntityBeanIntercept ebi);
 }

src/main/java/io/ebean/search/TextCommonTerms.java

@@ -13,7 +13,7 @@ package io.ebean.search;
  *    .lowFreqOperatorAnd(true)
  *    .highFreqOperatorAnd(true);
  *
- *  List<Customer> customers = server.find(Customer.class)
+ *  List<Customer> customers = database.find(Customer.class)
  *    .text()
  *    .textCommonTerms("the brown", options)
  *    .findList();

src/main/java/io/ebean/search/TextQueryString.java

@@ -13,7 +13,7 @@ package io.ebean.search;
  *       .lenient(true)
  *       .opAnd();
  *
- *   List<Customer> customers = server.find(Customer.class)
+ *   List<Customer> customers = database.find(Customer.class)
  *       .text()
  *       .textSimple("quick brown", options)
  *       .findList();
@@ -24,7 +24,7 @@ package io.ebean.search;
  *  // just use default options
  *  TextQueryString options = new TextQueryString();
  *
- *   List<Customer> customers = server.find(Customer.class)
+ *   List<Customer> customers = database.find(Customer.class)
  *       .text()
  *       .textSimple("quick brown", options)
  *       .findList();

src/main/java/io/ebean/search/TextSimple.java

@@ -13,7 +13,7 @@ package io.ebean.search;
  *       .lenient(true)
  *       .opAnd();
  *
- *   List<Customer> customers = server.find(Customer.class)
+ *   List<Customer> customers = database.find(Customer.class)
  *       .text()
  *       .textSimple("quick brown", options)
  *       .findList();

src/main/java/io/ebean/service/SpiContainer.java

@@ -12,7 +12,7 @@ public interface SpiContainer {
   /**
    * Create the EbeanServer for a given configuration.
    *
-   * @param configuration The configuration information for this server.
+   * @param configuration The configuration information for this database.
    */
   EbeanServer createServer(ServerConfig configuration);
 

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/BindParams.java

@@ -38,6 +38,11 @@ public class BindParams implements Serializable {
    */
   private String bindHash;
 
+  /**
+   * Helper to add positioned parameters in order.
+   */
+  private int addPos;
+
   public BindParams() {
   }
 
@@ -156,6 +161,19 @@ public class BindParams implements Serializable {
     p.setOutType(outType);
   }
 
+  public void setNextParameters(Object... values) {
+    for (Object value : values) {
+      setNextParameter(value);
+    }
+  }
+
+  /**
+   * Bind the next positioned parameter.
+   */
+  public void setNextParameter(Object value) {
+    setParameter(++addPos, value);
+  }
+
   /**
    * Using position set the In value of a parameter. Note that for nulls you
    * must use setNullParameter.

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

@@ -1,7 +1,7 @@
 package io.ebeaninternal.api;
 
-import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.metric.CountMetric;
 import io.ebean.metric.MetricFactory;
 import io.ebean.metric.TimedMetric;
 
@@ -12,14 +12,20 @@ public class ExtraMetrics {
 
   private final TimedMetric bindCapture;
   private final TimedMetric planCollect;
+  private final CountMetric loadOneL2;
+  private final CountMetric loadOneRef;
+  private final CountMetric loadOneNoLoader;
 
   /**
    * Create the extra metrics.
    */
   public ExtraMetrics() {
     final MetricFactory factory = MetricFactory.get();
-    this.bindCapture = factory.createTimedMetric(MetricType.ORM, "ebean.queryplan.bindcapture");
-    this.planCollect = factory.createTimedMetric(MetricType.ORM, "ebean.queryplan.collect");
+    this.bindCapture = factory.createTimedMetric("ebean.queryplan.bindcapture");
+    this.planCollect = factory.createTimedMetric("ebean.queryplan.collect");
+    this.loadOneL2 = factory.createCountMetric("loadone.l2");
+    this.loadOneRef = factory.createCountMetric("loadone.ref");
+    this.loadOneNoLoader = factory.createCountMetric("loadone.noloader");
   }
 
   /**
@@ -36,11 +42,38 @@ public class ExtraMetrics {
     return planCollect;
   }
 
+  /**
+   * Increment counter for lazy loading one bean from L2 cache.
+   * All good when lazy loading also hits L2 cache.
+   */
+  public void incrementLoadOneL2() {
+    loadOneL2.increment();
+  }
+
+  /**
+   * Increment counter for lazy loading on reference bean.
+   * We ought to be able to avoid this by changing to a tuned query.
+   */
+  public void incrementLoadOneRef() {
+    loadOneRef.increment();
+  }
+
+  /**
+   * Increment counter for lazy loading one bean due to no loader.
+   * Likely due to multiple stateless updates or serialisation.
+   */
+  public void incrementLoadOneNoLoader() {
+    loadOneNoLoader.increment();
+  }
+
   /**
    * Collect the metrics.
    */
   public void visitMetrics(MetricVisitor visitor) {
     bindCapture.visit(visitor);
     planCollect.visit(visitor);
+    loadOneL2.visit(visitor);
+    loadOneRef.visit(visitor);
+    loadOneNoLoader.visit(visitor);
   }
 }

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

@@ -118,7 +118,7 @@ public class LoadManyRequest extends LoadRequest {
     SpiQuery<?> query = many.newQuery(server);
     String orderBy = many.getLazyFetchOrderBy();
     if (orderBy != null) {
-      query.orderBy(orderBy);
+      query.order(orderBy);
     }
 
     String extraWhere = many.getExtraWhere();

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

@@ -0,0 +1,27 @@
+package io.ebeaninternal.api;
+
+import io.ebean.annotation.Platform;
+import io.ebean.util.StringHelper;
+
+public class PlatformMatch {
+
+  /**
+   * Return true if the script platforms is a match/supported for the given platform.
+   *
+   * @param platform  The database platform we are generating/running DDL for
+   * @param platforms The platforms (comma delimited) this script should run for
+   */
+  public static boolean matchPlatform(Platform platform, String platforms) {
+    if (platforms == null || platforms.trim().isEmpty()) {
+      return true;
+    }
+
+    // match on base platform name and platform name
+    for (String name : StringHelper.splitNames(platforms)) {
+      if (name.equalsIgnoreCase(platform.base().name()) || name.equalsIgnoreCase(platform.name())) {
+        return true;
+      }
+    }
+    return false;
+  }
+}

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/SpiDtoQuery.java

@@ -2,6 +2,7 @@ package io.ebeaninternal.api;
 
 import io.ebean.DtoQuery;
 import io.ebean.ProfileLocation;
+import io.ebean.Transaction;
 import io.ebeaninternal.server.dto.DtoMappingRequest;
 import io.ebeaninternal.server.dto.DtoQueryPlan;
 
@@ -65,4 +66,9 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
    */
   SpiQuery<?> getOrmQuery();
 
+  /**
+   * Return the explicit transaction used to execute the query.
+   */
+  Transaction getTransaction();
+
 }

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

@@ -31,7 +31,7 @@ import java.util.function.Predicate;
 /**
  * Service Provider extension to EbeanServer.
  */
-public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanLoader, BeanCollectionLoader {
+public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollectionLoader {
 
   /**
    * Return the log manager.
@@ -147,7 +147,7 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanLoader,
    *
    * @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/SpiExpression.java

@@ -13,6 +13,9 @@ import java.io.IOException;
  */
 public interface SpiExpression extends Expression {
 
+  static final String SQL_TRUE = "1=1";
+  static final String SQL_FALSE = "1=0";
+
   /**
    * Simplify nested expressions if possible.
    */

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

@@ -36,4 +36,11 @@ public interface SpiExpressionList<T> extends ExpressionList<T>, SpiExpression {
    * Write the top level where expressions taking into account possible extra idEquals expression.
    */
   void writeDocQuery(DocQueryContext context, SpiExpression idEquals) throws IOException;
+
+  /**
+   * Apply firstRow maxRows limits on the filterMany query.
+   */
+  default void applyRowLimits(SpiQuery<?> query) {
+    // do nothing by default
+  }
 }

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

@@ -1,5 +1,6 @@
 package io.ebeaninternal.api;
 
+import io.ebean.ProfileLocation;
 import io.ebeaninternal.server.transaction.ProfileStream;
 import io.ebeaninternal.server.transaction.TransactionProfile;
 
@@ -24,7 +25,7 @@ public interface SpiProfileHandler {
    * Create a profiling stream if we are profiling this transaction.
    * Return null if we are not profiling this transaction.
    *
-   * @param profileId The transaction profileId
+   * @param location The profile location
    */
-  ProfileStream createProfileStream(int profileId);
+  ProfileStream createProfileStream(ProfileLocation location);
 }

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

@@ -191,7 +191,7 @@ public interface SpiQuery<T> extends Query<T>, TxnProfileEventCodes {
   /**
    * Return the id used to identify a particular query for the given bean type.
    */
-  short getProfileId();
+  String getProfileId();
 
   /**
    * Return the profile location for this query.
@@ -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

@@ -20,7 +20,6 @@ import java.sql.SQLException;
  * Extends Transaction with additional API required on server.
  * <p>
  * Provides support for batching and TransactionContext.
- * </p>
  */
 public interface SpiTransaction extends Transaction {
 
@@ -65,7 +64,6 @@ public interface SpiTransaction extends Transaction {
    * Add a deleting bean to the registered list.
    * <p>
    * This is to handle bi-directional relationships where both sides Cascade.
-   * </p>
    */
   void registerDeleteBean(Integer hash);
 
@@ -86,7 +84,6 @@ public interface SpiTransaction extends Transaction {
    * the bean when cascade persist is on both sides of a relationship).
    * <p>
    * This will register the bean if it is not already.
-   * </p>
    */
   boolean isRegisteredBean(Object bean);
 
@@ -111,7 +108,6 @@ public interface SpiTransaction extends Transaction {
    * Return the batchSize specifically set for this transaction or 0.
    * <p>
    * Returning 0 implies to use the system wide default batch size.
-   * </p>
    */
   DocStoreMode getDocStoreMode();
 
@@ -125,7 +121,6 @@ public interface SpiTransaction extends Transaction {
    * Return the batchSize specifically set for this transaction or 0.
    * <p>
    * Returning 0 implies to use the system wide default batch size.
-   * </p>
    */
   @Override
   int getBatchSize();
@@ -141,11 +136,9 @@ public interface SpiTransaction extends Transaction {
    * As we cascade save or delete we traverse the object graph tree. Going up
    * to Assoc Ones the depth decreases and going down to Assoc Manys the depth
    * increases.
-   * </p>
    * <p>
    * The depth is used for ordering batching statements. The lowest depth get
    * executed first during save.
-   * </p>
    */
   void depth(int diff);
 
@@ -166,7 +159,6 @@ public interface SpiTransaction extends Transaction {
    * This information is used maintain the table state, cache and text
    * indexes. On commit the Table modifications this generates is broadcast
    * around the cluster (if you have a cluster).
-   * </p>
    */
   TransactionEvent getEvent();
 
@@ -198,7 +190,6 @@ public interface SpiTransaction extends Transaction {
    * You may wish to hold onto this and set it against another transaction
    * later. This is along the lines of 'extended persistence context'
    * behaviour.
-   * </p>
    */
   PersistenceContext getPersistenceContext();
 
@@ -211,7 +202,6 @@ public interface SpiTransaction extends Transaction {
    * is one PersistenceContext per Transaction. The getPersistenceContext()
    * and setPersistenceContext() enable a developer to reuse a single
    * PersistenceContext with multiple transactions.
-   * </p>
    */
   void setPersistenceContext(PersistenceContext context);
 
@@ -221,7 +211,6 @@ public interface SpiTransaction extends Transaction {
    * If the connection is made from Transaction and the user code calls
    * that method we can no longer trust the query only status of a
    * Transaction.
-   * </p>
    */
   Connection getInternalConnection();
 
@@ -324,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