#1966 Remove sequence batching - postgres opps

Also remove h2sqldb in favour of always using H2

.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.12</version>
+  <version>12.1.14-SNAPSHOT</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.12</tag>
+    <tag>HEAD</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.0</version>
     </dependency>
 
     <!--
@@ -118,7 +87,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>6.4</version>
+      <version>6.9</version>
     </dependency>
 
     <dependency>
@@ -130,7 +99,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
-      <version>4.7.1</version>
+      <version>4.7.3</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.3</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>
 

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;
@@ -669,7 +669,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

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

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

@@ -187,7 +187,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 +209,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 +796,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/EbeanServerFactory.java

@@ -48,7 +48,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 +59,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,8 @@ 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);
 
   /**
    * Return the OrderBy so that you can append an ascending or descending
@@ -77,27 +81,21 @@ public interface ExpressionList<T> {
   OrderBy<T> order();
 
   /**
-   * Return the OrderBy so that you can append an ascending or descending
-   * property to the order by clause.
-   * <p>
-   * This will never return a null. If no order by clause exists then an 'empty'
-   * OrderBy object is returned.
-   * </p>
+   * Deprecated migrate to order().
    */
+  @Deprecated
   OrderBy<T> orderBy();
 
   /**
-   * Add an orderBy clause to the query.
-   *
-   * @see Query#orderBy(String)
+   * Deprecated migrate to {@link #order(String)}
    */
+  @Deprecated
   Query<T> orderBy(String orderBy);
 
   /**
-   * Add an orderBy clause to the query.
-   *
-   * @see Query#orderBy(String)
+   * Deprecated migrate to {@link #order(String)}
    */
+  @Deprecated
   Query<T> setOrderBy(String orderBy);
 
   /**
@@ -334,7 +332,7 @@ public interface ExpressionList<T> {
    *  List<String> names =
    *    DB.find(Customer.class)
    *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findSingleAttributeList();
    *
    * }</pre>
@@ -347,7 +345,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 +506,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 +557,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.
@@ -1451,7 +1449,7 @@ public interface ExpressionList<T> {
    *        .eq("status", Customer.Status.ACTIVE)
    *        .gt("id", 0)
    *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findList();
    * }</pre>
    */
@@ -1472,7 +1470,7 @@ public interface ExpressionList<T> {
    *    .or()
    *      .eq("status", Customer.Status.ACTIVE)
    *      .isNull("anniversary")
-   *    .orderBy().asc("name")
+   *    .order().asc("name")
    *    .findList();
    *
    * }</pre>
@@ -1492,7 +1490,7 @@ public interface ExpressionList<T> {
    *        .eq("status", Customer.Status.ACTIVE)
    *        .gt("id", 0)
    *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findList();
    *
    * }</pre>
@@ -1526,7 +1524,7 @@ public interface ExpressionList<T> {
    *       .gt("id", 1)
    *       .eq("anniversary", onAfter)
    *       .endNot()
-   *     .orderBy()
+   *     .order()
    *       .asc("name")
    *     .findList();
    *

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

@@ -357,7 +357,7 @@ public interface ExtendedServer {
    *  List<String> names =
    *    DB.find(Customer.class)
    *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findSingleAttributeList();
    *
    * }</pre>
@@ -369,7 +369,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/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/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>
@@ -885,7 +890,7 @@ public interface Query<T> {
    *  List<String> names =
    *    DB.find(Customer.class)
    *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
    *      .findSingleAttributeList();
    *
    * }</pre>
@@ -898,7 +903,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 +1188,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>
@@ -1323,17 +1352,9 @@ public interface Query<T> {
   Query<T> having(Expression addExpressionToHaving);
 
   /**
-   * 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.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #order(String)}.
-   * </p>
+   * Deprecated migrate to {@link #order(String)}
    */
+  @Deprecated
   Query<T> orderBy(String orderByClause);
 
   /**
@@ -1343,10 +1364,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,40 +1373,24 @@ 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>
    */
   OrderBy<T> order();
 
   /**
-   * Return the OrderBy so that you can append an ascending or descending
-   * property to the order by clause.
-   * <p>
-   * This will never return a null. If no order by clause exists then an 'empty'
-   * OrderBy object is returned.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #order()}.
-   * </p>
+   * Deprecated migrate to order().
    */
+  @Deprecated
   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>
+   * Deprecated migrate to {@link #setOrder(OrderBy)}
    */
+  @Deprecated
   Query<T> setOrderBy(OrderBy<T> orderBy);
 
   /**

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/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,67 @@ 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>
+   *
+   * @param value The value to bind
+   */
+  SqlQuery setParameter(Object value);
+
+  /**
+   * Bind the parameter by its index position (1 based like JDBC).
    */
   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 +274,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

@@ -239,28 +239,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);
@@ -318,7 +318,7 @@ public interface Transaction extends AutoCloseable {
    * </p>
    * <pre>{@code
    *
-   * try (Transaction transaction = server.beginTransaction()) {
+   * try (Transaction transaction = database.beginTransaction()) {
    *
    *   transaction.setBatchMode(true);
    *   transaction.setBatchSize(100);

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

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

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

@@ -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;
@@ -1050,18 +1050,6 @@ public class ServerConfig {
     this.lazyLoadBatchSize = lazyLoadBatchSize;
   }
 
-  /**
-   * Set the number of sequences to fetch/preallocate when using DB sequences.
-   * <p>
-   * This is a performance optimisation to reduce the number times Ebean
-   * requests a sequence to be used as an Id for a bean (aka reduce network
-   * chatter).
-   * </p>
-   */
-  public void setDatabaseSequenceBatchSize(int databaseSequenceBatchSize) {
-    platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
-  }
-
   /**
    * Return the default JDBC fetchSize hint for findList queries.
    */
@@ -1828,32 +1816,6 @@ public class ServerConfig {
     this.platformConfig.setDatabaseBooleanFalse(databaseFalse);
   }
 
-  /**
-   * Return the number of DB sequence values that should be preallocated.
-   */
-  public int getDatabaseSequenceBatchSize() {
-    return platformConfig.getDatabaseSequenceBatchSize();
-  }
-
-  /**
-   * Set the number of DB sequence values that should be preallocated and cached
-   * by Ebean.
-   * <p>
-   * This is only used for DB's that use sequences and is a performance
-   * optimisation. This reduces the number of times Ebean needs to get a
-   * sequence value from the Database reducing network chatter.
-   * </p>
-   * <p>
-   * By default this value is 10 so when we need another Id (and don't have one
-   * in our cache) Ebean will fetch 10 id's from the database. Note that when
-   * the cache drops to have full (which is 5 by default) Ebean will fetch
-   * another batch of Id's in a background thread.
-   * </p>
-   */
-  public void setDatabaseSequenceBatch(int databaseSequenceBatchSize) {
-    this.platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
-  }
-
   /**
    * Return the database platform name (can be null).
    * <p>
@@ -1886,7 +1848,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 +2244,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 +2291,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 +2305,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 +2708,7 @@ public class ServerConfig {
    * Load settings from ebean.properties.
    */
   public void loadFromProperties() {
-    this.properties = PropertiesLoader.load();
+    this.properties = Config.asProperties();
     configureFromProperties();
   }
 
@@ -2755,7 +2717,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();
   }
 

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

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

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

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

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

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

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

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

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/db2/DB2Platform.java

@@ -52,9 +52,8 @@ public class DB2Platform extends DatabasePlatform {
    * sequence values.
    */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
-
-    return new DB2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
+    return new DB2Sequence(be, ds, seqName, increment);
   }
 
 }

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

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

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

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

src/main/java/io/ebean/config/dbplatform/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/H2DbSequence.java

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

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

@@ -42,13 +42,9 @@ public class H2Platform extends DatabasePlatform {
     dbTypeMap.put(DbType.UUID, new DbPlatformType("uuid", false));
   }
 
-  /**
-   * Return a H2 specific sequence IdGenerator that supports batch fetching
-   * sequence values.
-   */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
-    return new H2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
+    return new H2DbSequence(be, ds, seqName, increment);
   }
 
   @Override

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

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

src/main/java/io/ebean/config/dbplatform/hana/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/hsqldb/HsqldbPlatform.java

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

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

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

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

@@ -44,8 +44,8 @@ public class NuoDbPlatform extends DatabasePlatform {
   }
 
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
-    return new NuoDbSequence(be, ds, seqName, stepSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
+    return new NuoDbSequence(be, ds, seqName, increment);
   }
 
   @Override

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

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

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

@@ -0,0 +1,16 @@
+package io.ebean.config.dbplatform.oracle;
+
+import io.ebean.annotation.Platform;
+
+/**
+ * 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();
+  }
+}

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

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

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

@@ -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;
@@ -23,11 +22,12 @@ public class OraclePlatform extends DatabasePlatform {
   public OraclePlatform() {
     super();
     this.platform = Platform.ORACLE;
+    this.columnAliasPrefix = null;
     this.supportsDeleteTableAlias = true;
     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";
@@ -76,8 +76,8 @@ public class OraclePlatform extends DatabasePlatform {
   }
 
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
-    return new OracleSequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
+    return new OracleDbSequence(be, ds, seqName, increment);
   }
 
   @Override

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/oracle/OracleSequenceIdGenerator.java

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

src/main/java/io/ebean/config/dbplatform/postgres/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/PostgresDbSequence.java

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

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

@@ -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 {
 
@@ -110,9 +109,8 @@ public class PostgresPlatform extends DatabasePlatform {
    * Create a Postgres specific sequence IdGenerator.
    */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
-
-    return new PostgresSequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
+    return new PostgresDbSequence(be, ds, seqName, increment);
   }
 
   @Override

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

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

src/main/java/io/ebean/config/dbplatform/sqlanywhere/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/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

@@ -36,7 +36,6 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);
     this.dbIdentity.setSupportsSequence(true);
-    this.sequenceBatchMode = false;
 
     this.exceptionTranslator =
       new SqlErrorCodes()
@@ -95,12 +94,9 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     sb.append('[').append(ch).append(']');
   }
 
-  /**
-   * Create a Postgres specific sequence IdGenerator.
-   */
   @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
-    return new SqlServerStepSequence(be, ds, seqName, stepSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
+    return new SqlServerDbSequence(be, ds, seqName, increment);
   }
 
   /**

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

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

src/main/java/io/ebean/config/dbplatform/sqlserver/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/dbplatform/sqlserver/SqlServerStepSequence.java

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

src/main/java/io/ebean/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.
  */
@@ -156,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

@@ -20,7 +20,7 @@ public interface SpiServer extends EbeanServer, BeanLoader {
   ServerConfig getServerConfig();
 
   /**
-   * Return the DatabasePlatform for this server.
+   * Return the DatabasePlatform for this database.
    */
   DatabasePlatform getDatabasePlatform();
 

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/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,6 +1,5 @@
 package io.ebeaninternal.api;
 
-import io.ebean.meta.MetricType;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.metric.CountMetric;
 import io.ebean.metric.MetricFactory;
@@ -22,11 +21,11 @@ public class ExtraMetrics {
    */
   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.loadOneL2 = factory.createCountMetric(MetricType.ORM, "loadone.l2");
-    this.loadOneRef = factory.createCountMetric(MetricType.ORM, "loadone.ref");
-    this.loadOneNoLoader = factory.createCountMetric(MetricType.ORM, "loadone.noloader");
+    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");
   }
 
   /**

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/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/dbmigration/DdlGenerator.java

@@ -1,9 +1,9 @@
 package io.ebeaninternal.dbmigration;
 
+import io.ebean.annotation.Platform;
 import io.ebean.config.DbMigrationConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.migration.ddl.DdlAutoCommit;
 import io.ebean.migration.ddl.DdlRunner;
 import io.ebean.migration.runner.ScriptTransform;
 import io.ebean.util.JdbcClose;
@@ -48,6 +48,7 @@ public class DdlGenerator {
   private final boolean ddlAutoCommit;
   private final String dbSchema;
   private final ScriptTransform scriptTransform;
+  private final Platform platform;
   private final String platformName;
 
   private CurrentModel currentModel;
@@ -63,7 +64,8 @@ public class DdlGenerator {
     this.createOnly = serverConfig.isDdlCreateOnly();
     this.dbSchema = serverConfig.getDbSchema();
     final DatabasePlatform databasePlatform = server.getDatabasePlatform();
-    this.platformName = databasePlatform.getPlatform().base().name();
+    this.platform = databasePlatform.getPlatform();
+    this.platformName = platform.base().name();
     if (!serverConfig.getTenantMode().isDdlEnabled() && serverConfig.isDdlRun()) {
       log.warn("DDL can't be run on startup with TenantMode " + serverConfig.getTenantMode());
       this.runDdl = false;
@@ -188,7 +190,7 @@ public class DdlGenerator {
   protected void runDropSql(Connection connection) throws IOException {
     if (!createOnly) {
       if (extraDdl && jaxbPresent) {
-        String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), true);
+        String extraApply = ExtraDdlXmlReader.buildExtra(platform, true);
         if (extraApply != null) {
           runScript(connection, false, extraApply, "extra-ddl");
         }
@@ -209,13 +211,13 @@ public class DdlGenerator {
 
     if (extraDdl && jaxbPresent) {
       if (currentModel().isTablePartitioning()) {
-        String extraPartitioning = ExtraDdlXmlReader.buildPartitioning(server.getDatabasePlatform().getName());
+        String extraPartitioning = ExtraDdlXmlReader.buildPartitioning(platform);
         if (extraPartitioning != null && !extraPartitioning.isEmpty()) {
           runScript(connection, false, extraPartitioning, "builtin-partitioning-ddl");
         }
       }
 
-      String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName(), false);
+      String extraApply = ExtraDdlXmlReader.buildExtra(platform, false);
       if (extraApply != null) {
         runScript(connection, false, extraApply, "extra-ddl");
       }

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

@@ -14,11 +14,12 @@ import io.ebean.config.dbplatform.cockroach.CockroachPlatform;
 import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.config.dbplatform.hana.HanaPlatform;
-import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
 import io.ebean.config.dbplatform.mysql.MySql55Platform;
 import io.ebean.config.dbplatform.mysql.MySqlPlatform;
 import io.ebean.config.dbplatform.nuodb.NuoDbPlatform;
+import io.ebean.config.dbplatform.oracle.Oracle11Platform;
 import io.ebean.config.dbplatform.oracle.OraclePlatform;
+import io.ebean.config.dbplatform.postgres.Postgres9Platform;
 import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
 import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
@@ -49,6 +50,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
+
 /**
  * Generates DB Migration xml and sql scripts.
  * <p>
@@ -406,7 +409,7 @@ public class DefaultDbMigration implements DbMigration {
     if (extraDdl != null) {
       List<DdlScript> ddlScript = extraDdl.getDdlScript();
       for (DdlScript script : ddlScript) {
-        if (!script.isDrop() && ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
+        if (!script.isDrop() && matchPlatform(dbPlatform.getPlatform(), script.getPlatforms())) {
           writeExtraDdl(migrationDir, script);
         }
       }
@@ -810,8 +813,8 @@ public class DefaultDbMigration implements DbMigration {
     switch (platform) {
       case H2:
         return new H2Platform();
-      case HSQLDB:
-        return new HsqldbPlatform();
+      case POSTGRES9:
+        return new Postgres9Platform();
       case POSTGRES:
         return new PostgresPlatform();
       case MYSQL55:
@@ -820,6 +823,8 @@ public class DefaultDbMigration implements DbMigration {
         return new MySqlPlatform();
       case ORACLE:
         return new OraclePlatform();
+      case ORACLE11:
+        return new Oracle11Platform();
       case SQLANYWHERE:
         return new SqlAnywherePlatform();
       case SQLSERVER16:

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

@@ -44,8 +44,8 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
     String columnName = alter.getColumnName();
     String currentType = alter.getCurrentType();
     String type = alter.getType() != null ? alter.getType() : currentType;
-    type = convert(type, false);
-    currentType = convert(currentType, false);
+    type = convert(type);
+    currentType = convert(currentType);
     boolean notnull = (alter.isNotnull() != null) ? alter.isNotnull() : Boolean.TRUE.equals(alter.isCurrentNotnull());
     String notnullClause = notnull ? " not null" : "";
     String defaultValue = DdlHelp.isDropDefault(alter.getDefaultValue()) ? "null"
@@ -103,7 +103,7 @@ public abstract class AbstractHanaDdl extends PlatformDdl {
   protected String convertArrayType(String logicalArrayType) {
     Matcher matcher = ARRAY_PATTERN.matcher(logicalArrayType);
     if (matcher.matches()) {
-      return convert(matcher.group(1), false) + " array" + (matcher.group(2) == null ? "" : matcher.group(2));
+      return convert(matcher.group(1)) + " array" + (matcher.group(2) == null ? "" : matcher.group(2));
     } else {
       return fallbackArrayType;
     }

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

@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
+import io.ebean.annotation.Platform;
 import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.NamingConvention;
 import io.ebean.config.ServerConfig;
@@ -28,6 +29,8 @@ import io.ebeaninternal.dbmigration.migration.DropTable;
 import io.ebeaninternal.dbmigration.migration.ForeignKey;
 import io.ebeaninternal.dbmigration.migration.UniqueConstraint;
 import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.MTableIdentity;
+import io.ebeaninternal.server.deploy.IdentityMode;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -37,6 +40,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
 import static io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns.split;
 
 /**
@@ -168,18 +172,14 @@ public class BaseTableDdl implements TableDdl {
     }
 
     private List<String> getScriptsForPlatform(List<DdlScript> scripts) {
-      String searchPlatform = platformDdl.getPlatform().getName();
-      List<String> ret = Collections.emptyList();
+      Platform searchPlatform = platformDdl.getPlatform().getPlatform();
       for (DdlScript script : scripts) {
-        if (script.getPlatforms() == null || script.getPlatforms().isEmpty()) {
-          ret = script.getDdl();
-        } else for (String platform : StringHelper.splitNames(script.getPlatforms())) {
-          if (platform.equals(searchPlatform)) {
-           return script.getDdl();
-          }
+        if (matchPlatform(searchPlatform, script.getPlatforms())) {
+          // just returns the first match (rather than appends them)
+          return script.getDdl();
         }
       }
-      return ret;
+      return Collections.emptyList();
     }
 
     /**
@@ -248,21 +248,22 @@ public class BaseTableDdl implements TableDdl {
     List<Column> columns = createTable.getColumn();
     List<Column> pk = determinePrimaryKeyColumns(columns);
 
-    boolean singleColumnPrimaryKey = (pk.size() == 1);
-    boolean useIdentity = false;
-    boolean useSequence = false;
-
-    if (singleColumnPrimaryKey) {
-      IdType useDbIdentityType = platformDdl.useIdentityType(createTable.getIdentityType());
-      useIdentity = (IdType.IDENTITY == useDbIdentityType);
-      useSequence = (IdType.SEQUENCE == useDbIdentityType);
+    DdlIdentity identity = DdlIdentity.NONE;
+    if ((pk.size() == 1)) {
+      final IdentityMode identityMode = MTableIdentity.fromCreateTable(createTable);
+      IdType idType = platformDdl.useIdentityType(identityMode.getIdType());
+      String sequenceName = identityMode.getSequenceName();
+      if (IdType.SEQUENCE == idType && (sequenceName == null || sequenceName.isEmpty())) {
+        sequenceName = sequenceName(createTable, pk);
+      }
+      identity = new DdlIdentity(idType, identityMode, sequenceName);
     }
 
     String partitionMode = createTable.getPartitionMode();
 
     DdlBuffer apply = writer.apply();
     apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(tableName).append(" (");
-    writeTableColumns(apply, columns, useIdentity);
+    writeTableColumns(apply, columns, identity);
     writeUniqueConstraints(apply, createTable);
     writeCompoundUniqueConstraints(apply, createTable);
     if (!pk.isEmpty()) {
@@ -297,9 +298,8 @@ public class BaseTableDdl implements TableDdl {
     // we drop the related sequence (if sequences are used)
     dropTable(writer.dropAll(), tableName);
 
-    if (useSequence) {
-      String pkCol = pk.get(0).getName();
-      writeSequence(writer, createTable, pkCol);
+    if (identity.useSequence()) {
+      writeSequence(writer, identity);
     }
 
     // add blank line for a bit of whitespace between tables
@@ -311,6 +311,10 @@ public class BaseTableDdl implements TableDdl {
     }
   }
 
+  private String sequenceName(CreateTable createTable, List<Column> pk) {
+    return namingConvention.getSequenceName(createTable.getName(), pk.get(0).getName());
+  }
+
   /**
    * Add table and column comments (separate from the create table statement).
    */
@@ -350,8 +354,8 @@ public class BaseTableDdl implements TableDdl {
     }
   }
 
-  private void writeTableColumns(DdlBuffer apply, List<Column> columns, boolean useIdentity) throws IOException {
-    platformDdl.writeTableColumns(apply, columns, useIdentity);
+  private void writeTableColumns(DdlBuffer apply, List<Column> columns, DdlIdentity identity) throws IOException {
+    platformDdl.writeTableColumns(apply, columns, identity);
   }
 
   /**
@@ -380,18 +384,9 @@ public class BaseTableDdl implements TableDdl {
     }
   }
 
-  protected void writeSequence(DdlWrite writer, CreateTable createTable, String pk) throws IOException {
-    // explicit sequence use or platform decides
-    String explicitSequenceName = createTable.getSequenceName();
-    int initial = toInt(createTable.getSequenceInitial());
-    int allocate = toInt(createTable.getSequenceAllocate());
-
-    String seqName = explicitSequenceName;
-    if (seqName == null) {
-      seqName = namingConvention.getSequenceName(createTable.getName(), pk);
-    }
-
-    String createSeq = platformDdl.createSequence(seqName, initial, allocate);
+  protected void writeSequence(DdlWrite writer, DdlIdentity identity) throws IOException {
+    String seqName = identity.getSequenceName();
+    String createSeq = platformDdl.createSequence(seqName, identity);
     if (hasValue(createSeq)) {
       writer.apply().append(createSeq).newLine();
       writer.dropAll().appendStatement(platformDdl.dropSequence(seqName));
@@ -511,16 +506,7 @@ public class BaseTableDdl implements TableDdl {
   }
 
   private boolean platformInclude(String platforms) {
-    if (platforms == null || platforms.isEmpty()) {
-      return true;
-    }
-    String currentPlatform = platformDdl.getPlatform().getPlatform().name();
-    for (String name : StringHelper.splitNames(platforms)) {
-      if (currentPlatform.equalsIgnoreCase(name)) {
-        return true;
-      }
-    }
-    return false;
+    return matchPlatform(platformDdl.getPlatform().getPlatform(), platforms);
   }
 
   /**
@@ -951,6 +937,10 @@ public class BaseTableDdl implements TableDdl {
     }
 
     platformDdl.alterTableAddColumn(buffer, tableName, column, onHistoryTable, help.getDefaultValue());
+    final String comment = column.getComment();
+    if (comment != null && !comment.isEmpty()) {
+      platformDdl.addColumnComment(buffer, tableName, column.getName(), comment);
+    }
 
     if (!onHistoryTable) {
       help.writeAfter(buffer);

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

@@ -25,8 +25,7 @@ public class CockroachDdl extends PlatformDdl {
    * Map bigint, integer and smallint all into serial.
    */
   @Override
-  public String asIdentityColumn(String columnDefn) {
-
+  public String asIdentityColumn(String columnDefn, DdlIdentity identity) {
     if ("bigint".equalsIgnoreCase(columnDefn)) {
       return "serial";
     }

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

@@ -195,7 +195,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
    */
   protected void writeColumnDefinition(DdlBuffer buffer, String columnName, String type) throws IOException {
 
-    String platformType = platformDdl.convert(type, false);
+    String platformType = platformDdl.convert(type);
     buffer.append("  ");
     buffer.append(platformDdl.lowerColumnName(columnName), 29);
     buffer.append(platformType);

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

@@ -0,0 +1,98 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.annotation.IdentityGenerated;
+import io.ebean.config.dbplatform.IdType;
+import io.ebeaninternal.server.deploy.IdentityMode;
+
+public class DdlIdentity {
+
+  public static final DdlIdentity NONE = new DdlIdentity();
+
+  private final IdType idType;
+  private final IdentityMode identityMode;
+  private final String sequenceName;
+
+  public DdlIdentity(IdType idType, IdentityMode identityMode, String sequenceName) {
+    this.idType = idType;
+    this.identityMode = identityMode;
+    this.sequenceName = sequenceName;
+  }
+
+  private DdlIdentity() {
+    this.idType = null;
+    this.identityMode = null;
+    this.sequenceName = null;
+  }
+
+  public boolean useSequence() {
+    return idType == IdType.SEQUENCE;
+  }
+
+  public boolean useIdentity() {
+    return idType == IdType.IDENTITY;
+  }
+
+  public String getSequenceName() {
+    return sequenceName;
+  }
+
+  private String generatedBy() {
+    return isAlways() ? "always" : "by default";
+  }
+
+  private boolean isAlways() {
+    return IdentityGenerated.ALWAYS == identityMode.getGenerated();
+  }
+
+  public String optionGenerated() {
+    return " generated " + generatedBy() +" as identity";
+  }
+
+  public String identityOptions(String startWith, String incrementBy, String cache) {
+    return options(true, startWith, incrementBy, cache);
+  }
+
+  public String sequenceOptions(String startWith, String incrementBy, String cache) {
+    return options(false, startWith, incrementBy, cache);
+  }
+
+  private String options(boolean brackets, String startWith, String incrementBy, String cache) {
+    if (!identityMode.hasOptions()) {
+      return "";
+    }
+    StringBuilder sb = new StringBuilder(40);
+    if (brackets) {
+      sb.append(" (");
+    } else {
+      sb.append(" ");
+    }
+    optionFor(sb, startWith, identityMode.getStart());
+    optionFor(sb, incrementBy, identityMode.getIncrement());
+    optionFor(sb, cache, identityMode.getCache());
+    if (brackets) {
+      sb.append(")");
+    }
+    return sb.toString();
+  }
+
+  private void optionFor(StringBuilder sb, String prefix, int val) {
+    if (val > 0 && prefix != null) {
+      if (sb.length() > 2) {
+        sb.append(" ");
+      }
+      sb.append(prefix).append(" ").append(val);
+    }
+  }
+
+  public int getStart() {
+    return identityMode.getStart();
+  }
+
+  public int getIncrement() {
+    return identityMode.getIncrement();
+  }
+
+  public int getCache() {
+    return identityMode.getCache();
+  }
+}

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

@@ -12,6 +12,14 @@ public class H2Ddl extends PlatformDdl {
     this.historyDdl = new H2HistoryDdl();
   }
 
+  /**
+   * Modify and return the column definition for autoincrement or identity definition.
+   */
+  @Override
+  public String asIdentityColumn(String columnDefn, DdlIdentity identity) {
+    return asIdentityStandardOptions(columnDefn, identity);
+  }
+
   @Override
   protected String convertArrayType(String logicalArrayType) {
     return "array";

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

@@ -109,7 +109,7 @@ public class HanaHistoryDdl implements PlatformHistoryDdl {
   protected void writeColumnDefinition(DdlBuffer buffer, String columnName, String type, String defaultValue,
                                        boolean isNotNull, String generated) throws IOException {
 
-    String platformType = platformDdl.convert(type, false);
+    String platformType = platformDdl.convert(type);
     buffer.append(" ").append(platformDdl.lowerColumnName(columnName));
     buffer.append(" ").append(platformType);
     if (defaultValue != null) {

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

@@ -107,7 +107,7 @@ public class MySqlDdl extends PlatformDdl {
     String tableName = alter.getTableName();
     String columnName = alter.getColumnName();
     String type = alter.getType() != null ? alter.getType() : alter.getCurrentType();
-    type = convert(type, false);
+    type = convert(type);
     boolean notnull = (alter.isNotnull() != null) ? alter.isNotnull() : Boolean.TRUE.equals(alter.isCurrentNotnull());
     String notnullClause = notnull ? " not null" : "";
 
@@ -115,8 +115,8 @@ public class MySqlDdl extends PlatformDdl {
   }
 
   @Override
-  protected void writeColumnDefinition(DdlBuffer buffer, Column column, boolean useIdentity) throws IOException {
-    super.writeColumnDefinition(buffer, column, useIdentity);
+  protected void writeColumnDefinition(DdlBuffer buffer, Column column, DdlIdentity identity) throws IOException {
+    super.writeColumnDefinition(buffer, column, identity);
     String comment = column.getComment();
     if (!StringHelper.isNull(comment)) {
       // in mysql 5.5 column comment save in information_schema.COLUMNS.COLUMN_COMMENT(VARCHAR 1024)

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

@@ -19,7 +19,7 @@ public class Oracle10Ddl extends PlatformDdl {
     this.columnSetNotnull = "not null";
     this.columnSetNull = "null";
     this.columnSetDefault = "default";
-    this.identitySuffix = " generated always as identity";
+    this.identitySuffix = " generated by default as identity";
   }
 
   @Override

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

@@ -19,10 +19,7 @@ import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
 import io.ebeaninternal.dbmigration.migration.AlterColumn;
 import io.ebeaninternal.dbmigration.migration.Column;
 import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
-import io.ebeaninternal.dbmigration.migration.IdentityType;
 import io.ebeaninternal.dbmigration.model.MTable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -33,8 +30,6 @@ import java.util.List;
  */
 public class PlatformDdl {
 
-  private static final Logger logger = LoggerFactory.getLogger(PlatformDdl.class);
-
   protected final DatabasePlatform platform;
 
   protected PlatformHistoryDdl historyDdl = new NoHistorySupportDdl();
@@ -70,6 +65,12 @@ public class PlatformDdl {
   protected String foreignKeyOnUpdate = "on update";
 
   protected String identitySuffix = " auto_increment";
+  protected String identityStartWith = "start with";
+  protected String identityIncrementBy = "increment by";
+  protected String identityCache = "cache";
+  protected String sequenceStartWith = "start with";
+  protected String sequenceIncrementBy = "increment by";
+  protected String sequenceCache = "cache";
 
   protected String alterTableIfExists = "";
 
@@ -156,8 +157,7 @@ public class PlatformDdl {
    * Return the identity type to use given the support in the underlying database
    * platform for sequences and identity/autoincrement.
    */
-  public IdType useIdentityType(IdentityType modelIdentity) {
-
+  public IdType useIdentityType(IdType modelIdentity) {
     if (modelIdentity == null) {
       // use the default
       return dbIdentity.getIdType();
@@ -169,8 +169,7 @@ public class PlatformDdl {
    * Determine the id type to use based on requested identityType and
    * the support for that in the database platform.
    */
-  private IdType identityType(IdentityType modelIdentity, IdType platformIdType, boolean supportsSequence, boolean supportsIdentity) {
-
+  private IdType identityType(IdType modelIdentity, IdType platformIdType, boolean supportsSequence, boolean supportsIdentity) {
     switch (modelIdentity) {
       case GENERATOR:
         return IdType.GENERATOR;
@@ -188,10 +187,21 @@ public class PlatformDdl {
   /**
    * Modify and return the column definition for autoincrement or identity definition.
    */
-  public String asIdentityColumn(String columnDefn) {
+  public String asIdentityColumn(String columnDefn, DdlIdentity identity) {
     return columnDefn + identitySuffix;
   }
 
+  /**
+   * SQl2003 standard identity definition.
+   */
+  protected String asIdentityStandardOptions(String columnDefn, DdlIdentity identity) {
+
+    StringBuilder sb = new StringBuilder(columnDefn.length() + 60);
+    sb.append(columnDefn).append(identity.optionGenerated());
+    sb.append(identity.identityOptions(identityStartWith, identityIncrementBy, identityCache));
+    return sb.toString();
+  }
+
   /**
    * Return true if the table and column comments are included inline.
    */
@@ -224,13 +234,13 @@ public class PlatformDdl {
   /**
    * Write all the table columns converting to platform types as necessary.
    */
-  public void writeTableColumns(DdlBuffer apply, List<Column> columns, boolean useIdentity) throws IOException {
+  public void writeTableColumns(DdlBuffer apply, List<Column> columns, DdlIdentity identity) throws IOException {
     for (int i = 0; i < columns.size(); i++) {
       if (i > 0) {
         apply.append(",");
       }
       apply.newLine();
-      writeColumnDefinition(apply, columns.get(i), useIdentity);
+      writeColumnDefinition(apply, columns.get(i), identity);
     }
 
     for (Column column : columns) {
@@ -248,14 +258,16 @@ public class PlatformDdl {
   /**
    * Write the column definition to the create table statement.
    */
-  protected void writeColumnDefinition(DdlBuffer buffer, Column column, boolean useIdentity) throws IOException {
+  protected void writeColumnDefinition(DdlBuffer buffer, Column column, DdlIdentity identity) throws IOException {
 
-    boolean identityColumn = useIdentity && isTrue(column.isPrimaryKey());
-    String platformType = convert(column.getType(), identityColumn);
+    String columnDefn = convert(column.getType());
+    if (identity.useIdentity() && isTrue(column.isPrimaryKey())) {
+      columnDefn = asIdentityColumn(columnDefn, identity);
+    }
 
     buffer.append("  ");
     buffer.append(lowerColumnName(column.getName()), 29);
-    buffer.append(platformType);
+    buffer.append(columnDefn);
     if (!Boolean.TRUE.equals(column.isPrimaryKey())) {
       String defaultValue = convertDefaultValue(column.getDefaultValue());
       if (defaultValue != null) {
@@ -301,15 +313,14 @@ public class PlatformDdl {
   /**
    * Convert the standard type to the platform specific type.
    */
-  public String convert(String type, boolean identity) {
+  public String convert(String type) {
     if (type == null) {
       return null;
     }
     if (type.contains("[]")) {
       return convertArrayType(type);
     }
-    String platformType = typeConverter.convert(type);
-    return identity ? asIdentityColumn(platformType) : platformType;
+    return typeConverter.convert(type);
   }
 
   /**
@@ -354,16 +365,10 @@ public class PlatformDdl {
   /**
    * Generate and return the create sequence DDL.
    */
-  public String createSequence(String sequenceName, int initialValue, int allocationSize) {
-
+  public String createSequence(String sequenceName, DdlIdentity identity) {
     StringBuilder sb = new StringBuilder("create sequence ");
     sb.append(sequenceName);
-    if (initialValue > 1) {
-      sb.append(" start with ").append(initialValue);
-    }
-    if (allocationSize > 1) {
-      sb.append(" increment by ").append(allocationSize);
-    }
+    sb.append(identity.sequenceOptions(sequenceStartWith, sequenceIncrementBy, sequenceCache));
     sb.append(";");
     return sb.toString();
   }
@@ -515,13 +520,12 @@ public class PlatformDdl {
 
   public void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable, String defaultValue) throws IOException {
 
-    String convertedType = convert(column.getType(), false);
+    String convertedType = convert(column.getType());
 
     buffer.append("alter table ").append(tableName)
       .append(" ").append(addColumn).append(" ").append(column.getName())
       .append(" ").append(convertedType);
 
-
     // Add default value also to history table if it is not excluded
     if (defaultValue != null) {
       if (!onHistoryTable || !isTrue(column.isHistoryExclude())) {
@@ -572,8 +576,7 @@ public class PlatformDdl {
    * </p>
    */
   public String alterColumnType(String tableName, String columnName, String type) {
-
-    return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + columnSetType + convert(type, false) + alterColumnSuffix;
+    return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + columnSetType + convert(type) + alterColumnSuffix;
   }
 
   /**
@@ -583,7 +586,6 @@ public class PlatformDdl {
    * </p>
    */
   public String alterColumnNotnull(String tableName, String columnName, boolean notnull) {
-
     String suffix = notnull ? columnSetNotnull : columnSetNull;
     return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + suffix + alterColumnSuffix;
   }
@@ -592,7 +594,6 @@ public class PlatformDdl {
    * Alter table adding the check constraint.
    */
   public String alterTableAddCheckConstraint(String tableName, String checkConstraintName, String checkConstraint) {
-
     return "alter table " + tableName + " " + addConstraint + " " + maxConstraintName(checkConstraintName) + " " + checkConstraint;
   }
 
@@ -627,12 +628,6 @@ public class PlatformDdl {
     buffer.append(")");
   }
 
-  protected void appendWithSpace(String content, StringBuilder buffer) {
-    if (hasValue(content)) {
-      buffer.append(" ").append(content);
-    }
-  }
-
   /**
    * Convert the table to lower case.
    * <p>

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

@@ -0,0 +1,27 @@
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+
+public class Postgres9Ddl extends PostgresDdl {
+
+  public Postgres9Ddl(DatabasePlatform platform) {
+    super(platform);
+  }
+
+  /**
+   * Map bigint, integer and smallint into their equivalent serial types.
+   */
+  @Override
+  public String asIdentityColumn(String columnDefn, DdlIdentity identity) {
+    if ("bigint".equalsIgnoreCase(columnDefn)) {
+      return "bigserial";
+    }
+    if ("integer".equalsIgnoreCase(columnDefn)) {
+      return "serial";
+    }
+    if ("smallint".equalsIgnoreCase(columnDefn)) {
+      return "smallserial";
+    }
+    return columnDefn;
+  }
+}

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

@@ -37,23 +37,6 @@ public class PostgresDdl extends PlatformDdl {
     return NativeDbArray.logicalToNative(logicalArrayType);
   }
 
-  /**
-   * Map bigint, integer and smallint into their equivalent serial types.
-   */
-  @Override
-  public String asIdentityColumn(String columnDefn) {
-    if ("bigint".equalsIgnoreCase(columnDefn)) {
-      return "bigserial";
-    }
-    if ("integer".equalsIgnoreCase(columnDefn)) {
-      return "serial";
-    }
-    if ("smallint".equalsIgnoreCase(columnDefn)) {
-      return "smallserial";
-    }
-    return columnDefn;
-  }
-
   @Override
   public void addTablePartition(DdlBuffer apply, String partitionMode, String partitionColumn) throws IOException {
     apply.append(" partition by range (").append(partitionColumn).append(")");
@@ -63,4 +46,12 @@ public class PostgresDdl extends PlatformDdl {
   public String dropIndex(String indexName, String tableName, boolean concurrent) {
     return (concurrent ? dropIndexConcurrentlyIfExists : dropIndexIfExists) + maxConstraintName(indexName);
   }
+
+  /**
+   * Modify and return the column definition for autoincrement or identity definition.
+   */
+  @Override
+  public String asIdentityColumn(String columnDefn, DdlIdentity identity) {
+    return asIdentityStandardOptions(columnDefn, identity);
+  }
 }

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

@@ -114,18 +114,22 @@ public class SqlServerDdl extends PlatformDdl {
    * Generate and return the create sequence DDL.
    */
   @Override
-  public String createSequence(String sequenceName, int initialValue, int allocationSize) {
-
-    StringBuilder sb = new StringBuilder("create sequence ");
-    sb.append(sequenceName);
-    sb.append(" as bigint ");
-    if (initialValue > 1) {
-      sb.append(" start with ").append(initialValue);
+  public String createSequence(String sequenceName, DdlIdentity identity) {
+    StringBuilder sb = new StringBuilder(80);
+    sb.append("create sequence ").append(sequenceName).append(" as bigint");
+    final int start = identity.getStart();
+    if (start > 1) {
+      sb.append(" start with ").append(start);
     } else {
-      sb.append(" start with 1 ");
+      sb.append(" start with 1");
     }
-    if (allocationSize > 1) {
-      sb.append(" increment by ").append(allocationSize);
+    final int increment = identity.getIncrement();
+    if (increment > 1) {
+      sb.append(" increment by ").append(increment);
+    }
+    final int cache = identity.getCache();
+    if (cache > 1) {
+      sb.append(" cache ").append(increment);
     }
     sb.append(";");
     return sb.toString();
@@ -157,7 +161,7 @@ public class SqlServerDdl extends PlatformDdl {
     String tableName = alter.getTableName();
     String columnName = alter.getColumnName();
     String type = alter.getType() != null ? alter.getType() : alter.getCurrentType();
-    type = convert(type, false);
+    type = convert(type);
     boolean notnull = (alter.isNotnull() != null) ? alter.isNotnull() : Boolean.TRUE.equals(alter.isCurrentNotnull());
     String notnullClause = notnull ? " not null" : "";
 

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

@@ -31,11 +31,14 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl {
     enableSystemVersioning(writer, baseTable);
   }
 
-  private String getHistoryTable(String baseTable) {
-    String historyTable = baseTable + "_history"; // history must contain schema, otherwise you'll get
-    // Setting SYSTEM_VERSIONING to ON failed because history table 'xxx_history' is not specified in two-part name format.
+  String getHistoryTable(String baseTable) {
+    String historyTable = baseTable + "_history";
+    if (baseTable.startsWith("[")) {
+      historyTable = historyTable.replace("]", "") + "]";
+    }
     if (historyTable.indexOf('.') == -1) {
-      historyTable = "dbo." +historyTable; // so add the default schema, if none was specified.
+      // history must contain schema, add the default schema if none was specified
+      historyTable = "dbo." + historyTable;
     }
     return historyTable;
   }
@@ -86,10 +89,10 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl {
     DdlBuffer apply = writer.applyHistoryView();
     String baseTableName = baseTable.getBaseTable();
     apply.append("-- alter table ").append(baseTableName).append(" set (system_versioning = off (history_table=")
-    .append(getHistoryTable(baseTableName)).append("))").endOfStatement();
+      .append(getHistoryTable(baseTableName)).append("))").endOfStatement();
     apply.append("-- history migration goes here").newLine();
     apply.append("-- alter table ").append(baseTableName).append(" set (system_versioning = on (history_table=")
-    .append(getHistoryTable(baseTableName)).append("))").endOfStatement();
+      .append(getHistoryTable(baseTableName)).append("))").endOfStatement();
 
   }
 }