[maven-release-plugin] prepare release avaje-ebeanorm-7.11.3

Add "some java code" placeholder

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+
+GITHUB ISSUES ARE STRICTLY CONTROLLED FOR THIS PROJECT.
+
+Refer to http://ebean-orm.github.io/support for the policies controlling the use of github issues.
+Please post issues to the Ebean group https://groups.google.com/forum/#!forum/ebean first.
+
+## Expected behavior
+
+## Actual behavior
+
+### Steps to reproduce
+
+```java
+  // some java code
+```
+
+```console
+  // some logging output
+```

README.md

@@ -1,14 +1,17 @@
-* [![Maven Central : avaje-ebeanorm](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm) - avaje-ebeanorm 
-* [![Maven Central : avaje-ebeanorm-agent](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm-agent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm-agent) - avaje-ebeanorm-agent
-* [![Maven Central : avaje-ebeanorm-agent](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm-mavenenhancer/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm-mavenenhancer) - avaje-ebeanorm-mavenenhancer
+# Need help?
+Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean
 
-
-Ebean ORM
-==============
-[https://ebean-orm.github.io/](http://ebean-orm.github.io/ "Ebean ORM's Website")
+# Documentation
+Goto [https://ebean-orm.github.io/](http://ebean-orm.github.io/ "Ebean ORM's Website")
 
 
+## Maven cental links:
 [Maven central - avaje-ebeanorm](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.avaje.ebeanorm%22%20AND%20a%3A%22avaje-ebeanorm%22 "maven central ebeanorm")
 
 [Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cavaje-ebeanorm "maven central ebeanorm")
 
+## Current versions
+* [![Maven Central : avaje-ebeanorm](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm) - avaje-ebeanorm 
+* [![Maven Central : avaje-ebeanorm-agent](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm-agent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm-agent) - avaje-ebeanorm-agent
+* [![Maven Central : avaje-ebeanorm-agent](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm-mavenenhancer/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.avaje.ebeanorm/avaje-ebeanorm-mavenenhancer) - avaje-ebeanorm-mavenenhancer
+

pom.xml

@@ -3,13 +3,13 @@
 
   <parent>
     <groupId>org.avaje</groupId>
-    <artifactId>avaje-javaparent</artifactId>
-    <version>1.2</version>
+    <artifactId>oss-parent</artifactId>
+    <version>1.1</version>
   </parent>
 
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm</artifactId>
-  <version>7.5.1</version>
+  <version>7.11.3</version>
   <packaging>jar</packaging>
 
   <name>avaje-ebeanorm</name>
@@ -36,9 +36,8 @@
   </developers>
 
   <scm>
-    <connection>scm:git:https://github.com/ebean-orm/avaje-ebeanorm.git</connection>
     <developerConnection>scm:git:https://github.com/ebean-orm/avaje-ebeanorm.git</developerConnection>
-    <url>https://github.com/ebean-orm/avaje-ebeanorm.git</url>
+    <tag>avaje-ebeanorm-7.11.3</tag>
   </scm>
 
   <dependencies>
@@ -64,14 +63,19 @@
     <dependency>
       <groupId>org.avaje</groupId>
       <artifactId>avaje-datasource</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.3</version>
     </dependency>
 
-    <!-- bring in cluster support by default -->
     <dependency>
-      <groupId>org.avaje.ebeanorm</groupId>
-      <artifactId>avaje-ebeanorm-cluster</artifactId>
-      <version>1.1.1</version>
+      <groupId>org.avaje</groupId>
+      <artifactId>avaje-classpath-scanner-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.avaje</groupId>
+      <artifactId>avaje-classpath-scanner</artifactId>
+      <version>2.1.1</version>
     </dependency>
 
     <dependency>
@@ -80,12 +84,11 @@
       <version>[1.7.1,1.7.99)</version>
     </dependency>
 
-    <!-- provided scope for Spring boot loader classpath scanning support -->
+    <!-- Jackson core used internally by Ebean -->
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-loader</artifactId>
-      <version>1.2.7.RELEASE</version>
-      <scope>provided</scope>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.6.5</version>
     </dependency>
 
     <!-- provided scope for JsonNode support -->
@@ -96,13 +99,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- Jackson core used internally by Ebean -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <version>2.6.5</version>
-    </dependency>
-
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>jta</artifactId>
@@ -140,6 +136,8 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Test scope -->
+
     <!--<dependency>-->
       <!--<groupId>oracle</groupId>-->
       <!--<artifactId>oracle-jdbc</artifactId>-->
@@ -213,12 +211,19 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.avaje.moduuid</groupId>
+      <artifactId>avaje-moduuid</artifactId>
+      <version>1.2</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 
-  <!-- Enhance the meta beans -->
   <build>
     <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -228,12 +233,12 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.avaje.ebeanorm</groupId>
         <artifactId>avaje-ebeanorm-mavenenhancer</artifactId>
         <version>4.9.2</version>
         <executions>
-          <!--   Not going to enhance Model bean -->
           <execution>
             <id>test</id>
             <phase>process-test-classes</phase>
@@ -270,7 +275,8 @@
           </systemProperties>
         </configuration>
       </plugin>
- 	 <plugin>
+
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.5</version>
@@ -280,6 +286,7 @@
           </archive>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -305,7 +312,6 @@
           <linksource>true</linksource>
           <overview>src/main/java/com/avaje/ebean/overview.html</overview>
         </configuration>
-
         <executions>
           <execution>
             <id>attach-javadocs</id>
@@ -315,6 +321,7 @@
           </execution>
         </executions>
       </plugin>
+
     </plugins>
 
   </build>

src/main/java/com/avaje/ebean/Ebean.java

@@ -1,24 +1,21 @@
 package com.avaje.ebean;
 
+import com.avaje.ebean.cache.ServerCacheManager;
+import com.avaje.ebean.config.ServerConfig;
+import com.avaje.ebean.text.csv.CsvReader;
+import com.avaje.ebean.text.json.JsonContext;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
-
-import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.avaje.ebean.annotation.CacheStrategy;
-import com.avaje.ebean.cache.ServerCacheManager;
-import com.avaje.ebean.config.ServerConfig;
-import com.avaje.ebean.text.csv.CsvReader;
-import com.avaje.ebean.text.json.JsonContext;
-
 /**
  * This Ebean object is effectively a singleton that holds a map of registered
  * {@link EbeanServer}s. It additionally provides a convenient way to use the
@@ -731,11 +728,25 @@ public final class Ebean {
     return serverMgr.getDefaultServer().delete(beanType, id);
   }
 
+  /**
+   * Delete permanent the bean given its type and id.
+   */
+  public static int deletePermanent(Class<?> beanType, Object id) {
+    return serverMgr.getDefaultServer().deletePermanent(beanType, id);
+  }
+
   /**
    * Delete several beans given their type and id values.
    */
-  public static void deleteAll(Class<?> beanType, Collection<?> ids) {
-    serverMgr.getDefaultServer().deleteAll(beanType, ids);
+  public static int deleteAll(Class<?> beanType, Collection<?> ids) {
+    return serverMgr.getDefaultServer().deleteAll(beanType, ids);
+  }
+
+  /**
+   * Delete permanent several beans given their type and id values.
+   */
+  public static int deleteAllPermanent(Class<?> beanType, Collection<?> ids) {
+    return serverMgr.getDefaultServer().deleteAllPermanent(beanType, ids);
   }
 
   /**
@@ -1484,29 +1495,6 @@ public final class Ebean {
     return serverMgr.getDefaultServer().getBackgroundExecutor();
   }
 
-  /**
-   * Run the cache warming queries on all bean types that have one defined for
-   * the default/primary EbeanServer.
-   * <p>
-   * A cache warming query can be defined via {@link CacheStrategy}.
-   * </p>
-   */
-  public static void runCacheWarming() {
-    serverMgr.getDefaultServer().runCacheWarming();
-  }
-
-  /**
-   * Run the cache warming query for a specific bean type for the
-   * default/primary EbeanServer.
-   * <p>
-   * A cache warming query can be defined via {@link CacheStrategy}.
-   * </p>
-   */
-  public static void runCacheWarming(Class<?> beanType) {
-
-    serverMgr.getDefaultServer().runCacheWarming(beanType);
-  }
-
   /**
    * Return the JsonContext for reading/writing JSON.
    */

src/main/java/com/avaje/ebean/EbeanServer.java

@@ -1,6 +1,5 @@
 package com.avaje.ebean;
 
-import com.avaje.ebean.annotation.CacheStrategy;
 import com.avaje.ebean.cache.ServerCacheManager;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.meta.MetaInfoManager;
@@ -146,6 +145,17 @@ public interface EbeanServer {
    */
   Object getBeanId(Object bean);
 
+  /**
+   * Set the Id value onto the bean converting the type of the id value if necessary.
+   * <p>
+   * For example, if the id value passed in is a String but ought to be a Long or UUID etc
+   * then it will automatically be converted.
+   * </p>
+   *  @param bean The entity bean to set the id value on.
+   * @param id   The id value to set.
+   */
+  Object setBeanId(Object bean, Object id);
+
   /**
    * Return a map of the differences between two objects of the same type.
    * <p>
@@ -1003,22 +1013,6 @@ public interface EbeanServer {
    */
   <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);
 
-  /**
-   * Execute find list SQL query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   *
-   * @param query
-   *          the query to execute in the background
-   * @param transaction
-   *          the transaction (can be null).
-   * @return a Future object for the list result of the query
-   */
-  SqlFutureList findFutureList(SqlQuery query, Transaction transaction);
-
   /**
    * Return a PagedList for this query using pageIndex and pageSize.
    * <p>
@@ -1183,40 +1177,23 @@ public interface EbeanServer {
   List<SqlRow> findList(SqlQuery query, Transaction transaction);
 
   /**
-   * Execute the sql query returning a set of MapBean.
+   * Execute the SqlQuery iterating a row at a time.
    * <p>
-   * Generally you are able to use {@link SqlQuery#findSet()} rather than
-   * explicitly calling this method. You could use this method if you wish to
-   * explicitly control the transaction used for the query.
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
    * </p>
-   * 
-   * @param query
-   *          the query to execute.
-   * @param transaction
-   *          the transaction to use (can be null).
-   * @return the set of fetched MapBean.
-   *
-   * @see SqlQuery#findSet()
    */
-  Set<SqlRow> findSet(SqlQuery query, Transaction transaction);
+  void findEach(SqlQuery query, QueryEachConsumer<SqlRow> consumer, Transaction transaction);
 
   /**
-   * Execute the sql query returning a map of MapBean.
+   * Execute the SqlQuery iterating a row at a time with the ability to stop consuming part way through.
    * <p>
-   * Generally you are able to use {@link SqlQuery#findMap()} rather than
-   * explicitly calling this method. You could use this method if you wish to
-   * explicitly control the transaction used for the query.
+   * Returning false after processing a row stops the iteration through the query results.
+   * </p>
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
    * </p>
-   * 
-   * @param query
-   *          the query to execute.
-   * @param transaction
-   *          the transaction to use (can be null).
-   * @return the set of fetched MapBean.
-   *
-   * @see SqlQuery#findMap()
    */
-  Map<?, SqlRow> findMap(SqlQuery query, Transaction transaction);
+  void findEachWhile(SqlQuery query, QueryEachWhileConsumer<SqlRow> consumer, Transaction transaction);
 
   /**
    * Execute the sql query returning a single MapBean or null.
@@ -1340,6 +1317,16 @@ public interface EbeanServer {
    */
   int delete(Class<?> beanType, Object id, Transaction transaction);
 
+  /**
+   * Delete permanent given the bean type and id.
+   */
+  int deletePermanent(Class<?> beanType, Object id);
+
+  /**
+   * Delete permanent given the bean type and id with an explicit transaction.
+   */
+  int deletePermanent(Class<?> beanType, Object id, Transaction transaction);
+
   /**
    * Delete all the beans in the collection.
    */
@@ -1353,13 +1340,22 @@ public interface EbeanServer {
   /**
    * Delete several beans given their type and id values.
    */
-  void deleteAll(Class<?> beanType, Collection<?> ids);
+  int deleteAll(Class<?> beanType, Collection<?> ids);
 
   /**
-   * Delete several beans given their type and id values with an explicit
-   * transaction.
+   * Delete several beans given their type and id values with an explicit transaction.
    */
-  void deleteAll(Class<?> beanType, Collection<?> ids, Transaction transaction);
+  int deleteAll(Class<?> beanType, Collection<?> ids, Transaction transaction);
+
+  /**
+   * Delete permanent for several beans given their type and id values.
+   */
+  int deleteAllPermanent(Class<?> beanType, Collection<?> ids);
+
+  /**
+   * Delete permanent for several beans given their type and id values with an explicit transaction.
+   */
+  int deleteAllPermanent(Class<?> beanType, Collection<?> ids, Transaction transaction);
 
   /**
    * Execute a Sql Update Delete or Insert statement. This returns the number of
@@ -1835,22 +1831,6 @@ public interface EbeanServer {
    */
   BackgroundExecutor getBackgroundExecutor();
 
-  /**
-   * Run the cache warming queries on all bean types that have one defined.
-   * <p>
-   * A cache warming query can be defined via {@link CacheStrategy}.
-   * </p>
-   */
-  void runCacheWarming();
-
-  /**
-   * Run the cache warming query for a specific bean type.
-   * <p>
-   * A cache warming query can be defined via {@link CacheStrategy}.
-   * </p>
-   */
-  void runCacheWarming(Class<?> beanType);
-
   /**
    * Return the JsonContext for reading/writing JSON.
    * <p>

src/main/java/com/avaje/ebean/Expr.java

@@ -209,6 +209,20 @@ public class Expr {
     return Ebean.getExpressionFactory().icontains(propertyName, value);
   }
 
+  /**
+   * For collection properties that are empty (have not existing elements).
+   */
+  public static Expression isEmpty(String propertyName) {
+    return Ebean.getExpressionFactory().isEmpty(propertyName);
+  }
+
+  /**
+   * For collection properties that are not empty (have existing elements).
+   */
+  public static Expression isNotEmpty(String propertyName) {
+    return Ebean.getExpressionFactory().isNotEmpty(propertyName);
+  }
+
   /**
    * In - property has a value in the array of values.
    */

src/main/java/com/avaje/ebean/ExpressionFactory.java

@@ -87,6 +87,38 @@ public interface ExpressionFactory {
    */
   Expression jsonBetween(String propertyName, String path, Object lowerValue, Object upperValue);
 
+  /**
+   * Array contains all the given values.
+   * <p>
+   * Array support is effectively limited to Postgres at this time.
+   * </p>
+   */
+  Expression arrayContains(String propertyName, Object... values);
+
+  /**
+   * Array does not contain the given values.
+   * <p>
+   * Array support is effectively limited to Postgres at this time.
+   * </p>
+   */
+  Expression arrayNotContains(String propertyName, Object... values);
+
+  /**
+   * Array is empty - for the given array property.
+   * <p>
+   * Array support is effectively limited to Postgres at this time.
+   * </p>
+   */
+  Expression arrayIsEmpty(String propertyName);
+
+  /**
+   * Array is not empty - for the given array property.
+   * <p>
+   * Array support is effectively limited to Postgres at this time.
+   * </p>
+   */
+  Expression arrayIsNotEmpty(String propertyName);
+
   /**
    * Equal To - property equal to the given value.
    */
@@ -246,6 +278,16 @@ public interface ExpressionFactory {
    */
   Expression notExists(Query<?> subQuery);
 
+  /**
+   * Is empty expression for collection properties.
+   */
+  Expression isEmpty(String propertyName);
+
+  /**
+   * Is not empty expression for collection properties.
+   */
+  Expression isNotEmpty(String propertyName);
+
   /**
    * Id Equal to - ID property is equal to the value.
    */

src/main/java/com/avaje/ebean/ExpressionList.java

@@ -754,6 +754,16 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> notIn(String propertyName, Query<?> subQuery);
 
+  /**
+   * Is empty expression for collection properties.
+   */
+  ExpressionList<T> isEmpty(String propertyName);
+
+  /**
+   * Is not empty expression for collection properties.
+   */
+  ExpressionList<T> isNotEmpty(String propertyName);
+
   /**
    * Exists expression
    */
@@ -791,6 +801,35 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> allEq(Map<String, Object> propertyMap);
 
+  /**
+   * Array property contains entries with the given values.
+   */
+  ExpressionList<T> arrayContains(String propertyName, Object... values);
+
+  /**
+   * Array does not contain the given values.
+   * <p>
+   * Array support is effectively limited to Postgres at this time.
+   * </p>
+   */
+  ExpressionList<T> arrayNotContains(String propertyName, Object... values);
+
+  /**
+   * Array is empty - for the given array property.
+   * <p>
+   * Array support is effectively limited to Postgres at this time.
+   * </p>
+   */
+  ExpressionList<T> arrayIsEmpty(String propertyName);
+
+  /**
+   * Array is not empty - for the given array property.
+   * <p>
+   * Array support is effectively limited to Postgres at this time.
+   * </p>
+   */
+  ExpressionList<T> arrayIsNotEmpty(String propertyName);
+
   /**
    * Add raw expression with a single parameter.
    * <p>

src/main/java/com/avaje/ebean/Model.java

@@ -362,29 +362,6 @@ public abstract class Model {
       super(serverName, type);
     }
 
-    /**
-     * Please migrate to use {@link Find} or constructor <code>Finder(Class)</code> that
-     * does not have the idType parameter.
-     * <p/>
-     * Create with the type of the ID property and entity bean and specific server name.
-     *
-     * @deprecated
-     */
-    public Finder(Class<I> idType, Class<T> type) {
-      super(null, type);
-    }
-
-    /**
-     * Please migrate to use the constructor <code>Finder(String, Class)</code> that
-     * does not have the idType parameter.
-     * <p/>
-     * Create with the type of the ID property and entity bean and specific server name.
-     *
-     * @deprecated
-     */
-    public Finder(String serverName, Class<I> idType, Class<T> type) {
-      super(serverName, type);
-    }
   }
 
   /**

src/main/java/com/avaje/ebean/OrderBy.java

@@ -221,24 +221,39 @@ public final class OrderBy<T> implements Serializable {
 
     private boolean ascending;
 
+    private String nulls;
+
+    private String highLow;
+
     public Property(String property, boolean ascending) {
       this.property = property;
       this.ascending = ascending;
     }
 
+    public Property(String property, boolean ascending, String nulls, String highLow) {
+      this.property = property;
+      this.ascending = ascending;
+      this.nulls = nulls;
+      this.highLow = highLow;
+    }
+
     /**
      * Return a copy of this Property with the path trimmed.
      */
     public Property copyWithTrim(String path) {
-      return new Property(property.substring(path.length() + 1), ascending);
+      return new Property(property.substring(path.length() + 1), ascending, nulls, highLow);
     }
 
+    @Override
     public int hashCode() {
       int hc = property.hashCode();
       hc = hc * 31 + (ascending ? 0 : 1);
+      hc = hc * 31 + (nulls == null ? 0 : nulls.hashCode());
+      hc = hc * 31 + (highLow == null ? 0 : highLow.hashCode());
       return hc;
     }
-    
+
+    @Override
     public boolean equals(Object obj) {
       if (obj == this) {
         return true;
@@ -246,10 +261,11 @@ public final class OrderBy<T> implements Serializable {
       if (!(obj instanceof Property)) {
         return false;
       }
-      
       Property e = (Property) obj;
-      return e.ascending == ascending 
-          && e.property.equals(property);
+      if (ascending != e.ascending) return false;
+      if (!property.equals(e.property)) return false;
+      if (nulls != null ? !nulls.equals(e.nulls) : e.nulls != null) return false;
+      return highLow != null ? highLow.equals(e.highLow) : e.highLow == null;
     }
 
     public String toString() {
@@ -257,10 +273,20 @@ public final class OrderBy<T> implements Serializable {
     }
 
     public String toStringFormat() {
-      if (ascending) {
-        return property;
+      if (nulls == null) {
+        if (ascending) {
+          return property;
+        } else {
+          return property + " desc";
+        }
       } else {
-        return property + " desc";
+        StringBuilder sb = new StringBuilder();
+        sb.append(property);
+        if (!ascending) {
+          sb.append(" ").append("desc");
+        }
+        sb.append(" ").append(nulls).append(" ").append(highLow);
+        return  sb.toString();
       }
     }
 
@@ -282,7 +308,7 @@ public final class OrderBy<T> implements Serializable {
      * Return a copy of this property.
      */
     public Property copy() {
-      return new Property(property, ascending);
+      return new Property(property, ascending, nulls, highLow);
     }
 
     /**
@@ -323,7 +349,6 @@ public final class OrderBy<T> implements Serializable {
 
     String[] chunks = orderByClause.split(",");
     for (int i = 0; i < chunks.length; i++) {
-
       String[] pairs = chunks[i].split(" ");
       Property p = parseProperty(pairs);
       if (p != null) {
@@ -353,8 +378,12 @@ public final class OrderBy<T> implements Serializable {
       boolean asc = isAscending(wordList.get(1));
       return new Property(wordList.get(0), asc);
     }
-    String m = "Expecting a max of 2 words in [" + Arrays.toString(pairs)
-        + "] but got " + wordList.size();
+    if (wordList.size() == 4) {
+      // nulls high or nulls low as 3rd and 4th
+      boolean asc = isAscending(wordList.get(1));
+      return new Property(wordList.get(0), asc, wordList.get(2), wordList.get(3));
+    }
+    String m = "Expecting a 1, 2 or 4 words in [" + Arrays.toString(pairs) + "] but got " + wordList;
     throw new RuntimeException(m);
   }
 

src/main/java/com/avaje/ebean/Query.java

@@ -378,6 +378,12 @@ public interface Query<T> {
 
   /**
    * Execute the query including soft deleted rows.
+   * <p>
+   * This means that Ebean will not add any predicates to the query for filtering out
+   * soft deleted rows. You can still add your own predicates for the deleted properties
+   * and effectively you have full control over the query to include or exclude soft deleted
+   * rows as needed for a given use case.
+   * </p>
    */
   Query<T> setIncludeSoftDeletes();
 
@@ -1298,13 +1304,19 @@ public interface Query<T> {
   Query<T> setMapKey(String mapKey);
 
   /**
-   * Set this to true to use the bean cache.
+   * Set this to false to not use the bean cache.
    * <p>
-   * If the query result is in cache then by default this same instance is
-   * returned. In this sense it should be treated as a read only object graph.
+   * By default "find by id" and "find by natural key" will use the bean cache
+   * when bean caching is enabled. Setting this to false means that the query
+   * will not use the bean cache and instead hit the database.
+   * </p>
+   * <p>
+   * In the case of other queries (findList(), findEach() etc) then setting this to
+   * false beans that the if lazy loading is invoked that lazy loading will not try
+   * to use the bean cache.
    * </p>
    */
-  Query<T> setUseCache(boolean useBeanCache);
+  Query<T> setUseCache(boolean useCache);
 
   /**
    * Set this to true to use the query cache.

src/main/java/com/avaje/ebean/SqlFutureList.java

@@ -1,47 +0,0 @@
-package com.avaje.ebean;
-
-import java.util.List;
-import java.util.concurrent.Future;
-
-/**
- * The SqlFutureList represents the result of a background SQL query execution.
- * 
- * <p>
- * It extends the java.util.concurrent.Future.
- * </p>
- * 
- * <pre class="code">
- *  // create a query
- * String sql = ... ;
- * SqlQuery sqlQuery = Ebean.createSqlQuery(sql);
- * 
- *  // execute the query in a background thread
- * SqlFutureList sqlFuture = sqlQuery.findFutureList();
- * 
- *  // do something else ... we will sleep
- * Thread.sleep(3000);
- * System.out.println("end of sleep");
- * 
- * if (!futureList.isDone()){
- * 	// we can cancel the query execution
- * 	futureList.cancel(true);
- * }
- * 
- * System.out.println("and... done:"+futureList.isDone());
- * 
- * if (!futureList.isCancelled()){
- * 	// wait for the query to finish and return the list
- * 	List&lt;SqlRow&gt; list = futureList.get();
- * 	System.out.println("list:"+list);
- * }
- * 
- * </pre>
- * 
- * @author rob
- * 
- */
-public interface SqlFutureList extends Future<List<SqlRow>> {
-
-  SqlQuery getQuery();
-
-}

src/main/java/com/avaje/ebean/SqlQuery.java

@@ -21,45 +21,48 @@ import java.util.Set;
  * conversion support added.
  * </p>
  * 
- * <pre class="code">
- * // its typically a good idea to use a named query
- * // and put the sql in the orm.xml instead of in your code
+ * <pre>{@code
+ *
+ *   // its typically a good idea to use a named query
+ *   // and put the sql in the orm.xml instead of in your code
  * 
- * String sql = &quot;select id, name from customer where name like :name and status_code = :status&quot;;
+ *   String sql = "select id, name from customer where name like :name and status_code = :status";
  * 
- * SqlQuery sqlQuery = Ebean.createSqlQuery(sql);
- * sqlQuery.setParameter(&quot;name&quot;, &quot;Acme%&quot;);
- * sqlQuery.setParameter(&quot;status&quot;, &quot;ACTIVE&quot;);
+ *   SqlQuery sqlQuery = Ebean.createSqlQuery(sql);
+ *   sqlQuery.setParameter("name", "Acme%");
+ *   sqlQuery.setParameter("status", "ACTIVE");
  * 
- * // execute the query returning a List of MapBean objects
- * List&lt;SqlRow&gt; list = sqlQuery.findList();
- * </pre>
+ *   // execute the query returning a List of MapBean objects
+ *   List<SqlRow> list = sqlQuery.findList();
+ *
+ * }</pre>
  * 
  */
 public interface SqlQuery extends Serializable {
 
-  /**
-   * Cancel the query if support by the underlying database and driver.
-   * <p>
-   * This must be called from a different thread to the one executing the query.
-   * </p>
-   */
-  void cancel();
-
   /**
    * Execute the query returning a list.
    */
   List<SqlRow> findList();
 
   /**
-   * Execute the query returning a set.
+   * Execute the SqlQuery iterating a row at a time.
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
    */
-  Set<SqlRow> findSet();
+  void findEach(QueryEachConsumer<SqlRow> consumer);
 
   /**
-   * Execute the query returning a map.
+   * Execute the SqlQuery iterating a row at a time with the ability to stop consuming part way through.
+   * <p>
+   * Returning false after processing a row stops the iteration through the query results.
+   * </p>
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
    */
-  Map<?, SqlRow> findMap();
+  void findEachWhile(QueryEachWhileConsumer<SqlRow> consumer);
 
   /**
    * Execute the query returning a single row or null.
@@ -70,19 +73,6 @@ public interface SqlQuery extends Serializable {
    */
   SqlRow findUnique();
 
-  /**
-   * Execute find list SQL query in a background thread.
-   * <p>
-   * This returns a Future object which can be used to cancel, check the
-   * execution status (isDone etc) and get the value (with or without a
-   * timeout).
-   * </p>
-   * 
-   * @return a Future object for the list result of the query
-   * @deprecated
-   */
-  SqlFutureList findFutureList();
-
   /**
    * The same as bind for named parameters.
    */
@@ -93,19 +83,6 @@ public interface SqlQuery extends Serializable {
    */
   SqlQuery setParameter(int position, Object value);
 
-  /**
-   * Set a listener to process the query on a row by row basis.
-   * <p>
-   * It this case the rows are not loaded into the persistence context and
-   * instead can be processed by the query listener.
-   * </p>
-   * <p>
-   * Use this when you want to process a large query and do not want to hold the
-   * entire query result in memory.
-   * </p>
-   */
-  SqlQuery setListener(SqlQueryListener queryListener);
-
   /**
    * Set the index of the first row of the results to return.
    */
@@ -116,16 +93,6 @@ public interface SqlQuery extends Serializable {
    */
   SqlQuery setMaxRows(int maxRows);
 
-  /**
-   * Set the index after which fetching continues in a background thread.
-   */
-  SqlQuery setBackgroundFetchAfter(int backgroundFetchAfter);
-
-  /**
-   * Set the column to use to determine the keys for a Map.
-   */
-  SqlQuery setMapKey(String mapKey);
-
   /**
    * Set a timeout on this query.
    * <p>

src/main/java/com/avaje/ebean/SqlQueryListener.java

@@ -1,33 +0,0 @@
-package com.avaje.ebean;
-
-/**
- * Provides a mechanism for processing a SqlQuery one SqlRow at a time.
- * <p>
- * This is useful when the query will return a large number of results and you
- * want to process the beans one at a time rather than have all of the beans in
- * memory at once.
- * </p>
- * 
- * <pre class="code">
- * SqlQueryListener listener = ...;
- *    
- * SqlQuery query  = Ebean.createSqlQuery(&quot;my.large.query&quot;);
- *    
- * // set the listener that will process each row one at a time
- * query.setListener(listener);
- *    
- * // execute the query. Note that the returned
- * // list will be empty ... so don't bother assigning it...
- * query.findList();
- * </pre>
- */
-public interface SqlQueryListener {
-
-  /**
-   * Process the bean that has just been read.
-   * <p>
-   * Note this bean will not be added to the List Set or Map.
-   * </p>
-   */
-  void process(SqlRow bean);
-}

src/main/java/com/avaje/ebean/TxScope.java

@@ -36,6 +36,8 @@ public final class TxScope {
 
   int batchSize;
 
+  boolean skipGeneratedKeys;
+
   boolean readOnly;
 
   ArrayList<Class<? extends Throwable>> rollbackFor;
@@ -188,6 +190,21 @@ public final class TxScope {
     return this;
   }
 
+  /**
+   * Set if the transaction should skip reading generated keys for inserts.
+   */
+  public TxScope setSkipGeneratedKeys() {
+    this.skipGeneratedKeys = true;
+    return this;
+  }
+
+  /**
+   * Return true if getGeneratedKeys should be skipped for this transaction.
+   */
+  public boolean isSkipGeneratedKeys() {
+    return skipGeneratedKeys;
+  }
+
   /**
    * Return if the transaction should be treated as read only.
    */

src/main/java/com/avaje/ebean/annotation/Cache.java

@@ -0,0 +1,61 @@
+package com.avaje.ebean.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Specify the default cache use specific entity type.
+ */
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Cache {
+
+  /**
+   * Set this to true to enable the use of query cache.
+   * <p>
+   * By default query caching is disabled as the query cache invalidates
+   * frequently and so it is typically used for specific bean types and cases.
+   * </p>
+   */
+  boolean enableQueryCache() default false;
+
+  /**
+   * Set this to false to disable the use of bean cache.
+   * <p>
+   * By default bean caching is expected so this defaults to true.  We might
+   * set this to false on a bean type that we want to use query caching but no
+   * bean caching (and this is expected to be a rare case).
+   * </p>
+   * <p>
+   * When bean caching is enabled by default "find by id" and "find by unique natural key"
+   * queries will try to use the bean cache. We use {@link com.avaje.ebean.Query#setUseCache(boolean)}
+   * with <code>false</code> for the case when we do NOT want to use the bean cache.
+   * </p>
+   */
+  boolean enableBeanCache() default true;
+
+  /**
+   * Specify the property that is a natural unique identifier for the bean.
+   * <p>
+   * When a findUnique() query is used with this property as the sole expression
+   * then there will be a lookup into the L2 natural key cache.
+   * </p>
+   */
+  String naturalKey() default "";
+
+  /**
+   * When set to true the beans returned from a query will default to be
+   * readOnly.
+   * <p>
+   * If the bean is readOnly and has no relationships then it may be sharable.
+   * </p>
+   * <p>
+   * If you try to modify a readOnly bean it will throw an
+   * IllegalStateException.
+   * </p>
+   */
+  boolean readOnly() default false;
+
+}

src/main/java/com/avaje/ebean/annotation/CacheBeanTuning.java

@@ -0,0 +1,56 @@
+package com.avaje.ebean.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Cache tuning hints for the L2 bean cache of a specific entity type.
+ * <p>
+ * Note that this is not useful when distributed L2 bean caches are used like
+ * ElasticSearch, Hazelcast, Ignite etc.
+ * </p>
+ */
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface CacheBeanTuning {
+
+  /**
+   * The maximum size for the cache.
+   * <p>
+   * This defaults to 0 which means unlimited.
+   * </p>
+   */
+  int maxSize() default 0;
+
+  /**
+   * The maximum time (in seconds) that a cache entry is allowed to stay in the
+   * cache when it has not been accessed.
+   * <p>
+   * This defaults to 0 which means unlimited.
+   * </p>
+   */
+  int maxIdleSecs() default 0;
+
+  /**
+   * The maximum time (in seconds) a cache entry is allowed to stay in the
+   * cache.
+   * <p>
+   * This is not generally required as the cache entries are automatically
+   * evicted when related data changes are committed.
+   * </p>
+   * <p>
+   * This defaults to 0 which means unlimited.
+   * </p>
+   */
+  int maxSecsToLive() default 0;
+
+  /**
+   * The frequency (in seconds) that cache trimming should occur.
+   * <p>
+   * This is a hint for cache implementations that use background cache trimming.
+   * </p>
+   */
+  int trimFrequency() default 0;
+}

src/main/java/com/avaje/ebean/annotation/CacheQueryTuning.java

@@ -6,14 +6,14 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Specify cache tuning for a specific entity type.
+ * Specify cache tuning for query caching on a specific entity type.
  * <p>
  * If this is not specified then the system default settings are used.
  * </p>
  */
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface CacheTuning {
+public @interface CacheQueryTuning {
 
   /**
    * The maximum size for the cache.

src/main/java/com/avaje/ebean/annotation/CacheStrategy.java

@@ -1,58 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.avaje.ebean.Query;
-
-/**
- * Specify the default cache use specific entity type.
- */
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CacheStrategy {
-
-  /**
-   * When set to true the bean cache will be used unless explicitly stated not
-   * to in a query via {@link Query#setUseCache(boolean)}.
-   */
-  boolean useBeanCache() default true;
-
-  /**
-   * A single property that is a natural unique identifier for the bean.
-   * <p>
-   * When a findUnique query is used with this property as the sole expression
-   * then there will be a lookup into the L2 natural key cache.
-   * </p>
-   */
-  String naturalKey() default "";
-
-  /**
-   * When set to true the beans returned from a query will default to be
-   * readOnly.
-   * <p>
-   * If the bean is readOnly and has no relationships then it may be sharable.
-   * </p>
-   * <p>
-   * If you try to modify a readOnly bean it will throw an
-   * IllegalStateException.
-   * </p>
-   */
-  boolean readOnly() default false;
-
-  /**
-   * Specify a query that can be used to warm the cache.
-   * <p>
-   * All the beans fetched by this query will be loaded into the bean cache and
-   * the query itself will be loaded into the query cache.
-   * </p>
-   * <p>
-   * The warming query will typically be executed at startup time after a short
-   * delay (defaults to a 30 seconds delay).
-   * </p>
-   */
-  String warmingQuery() default "";
-
-}

src/main/java/com/avaje/ebean/annotation/DbArray.java

@@ -0,0 +1,40 @@
+package com.avaje.ebean.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Specify a collection property that will be stored into a DB ARRAY type.
+ * <p>
+ * If the target database does not support ARRAY type (so not Postgres)
+ * then the collection will be stored in JSON format into a VARCHAR column.
+ * </p>
+ *
+ * <h3>Example:</h3>
+ * <pre>{@code
+ *
+ * // Store as ARRAY of UUID on Postgres
+ * @DbArray
+ * List<UUID> uids = new ArrayList<>();
+ *
+ * // Store as ARRAY on Postgres
+ * @DbArray
+ * List<String> phoneNumbers = new ArrayList<>();
+ *
+ * // Store as ARRAY of INTEGER on Postgres
+ * @DbArray
+ * List<Long> someLongs = new ArrayList<>();
+ *
+ * }</pre>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface DbArray {
+
+  /**
+   * For VARCHAR storage specify the column length (defaults to 1000).
+   */
+  int length() default 0;
+}

src/main/java/com/avaje/ebean/annotation/DbHstore.java

@@ -23,4 +23,8 @@ import java.lang.annotation.Target;
 @Target(ElementType.FIELD)
 public @interface DbHstore {
 
+  /**
+   * For VARCHAR storage specify the column length (defaults to 1000).
+   */
+  int length() default 0;
 }

src/main/java/com/avaje/ebean/annotation/DbJsonB.java

@@ -36,4 +36,8 @@ import java.lang.annotation.Target;
 @Target(ElementType.FIELD)
 public @interface DbJsonB {
 
+  /**
+   * For VARCHAR storage specify the column length.
+   */
+  int length() default 0;
 }

src/main/java/com/avaje/ebean/annotation/DocStoreEmbedded.java

@@ -1,21 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Deprecated in favor of @DocEmbedded (i.e. renamed to @DocEmbedded)
- */
-@Target({ ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface DocStoreEmbedded {
-
-  /**
-   * The properties on the embedded bean to include in the index.
-   */
-  String doc() default "";
-
-}

src/main/java/com/avaje/ebean/annotation/EntityConcurrencyMode.java

@@ -1,19 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Specify explicit ConcurrencyMode for entity bean.
- */
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EntityConcurrencyMode {
-  
-  /**
-   * The ConcurrencyMode value.
-   */
-  ConcurrencyMode value();
-}

src/main/java/com/avaje/ebean/annotation/EnumMapping.java

@@ -1,90 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * For mapping the values of an Enum to and from Database values.
- * <p>
- * Also refer to the {@link EnumValue} approach which probably the preferred now
- * (preferred over using this EnumMapping annotation).
- * </p>
- * <p>
- * Both of the approaches defined in the JPA have significant problems!!!
- * </p>
- * <p>
- * Using the ordinal value is VERY RISKY because that depends on the compile
- * order of the enum values. Aka if you change the order of the enum values you
- * have changed their ordinal values and now your DB values are WRONG - a HUGE
- * disaster!!!.
- * </p>
- * <p>
- * Using the String values of enums is fairly restrictive because in a Database
- * these values are usually truncated into short codes (e.g. "A" short for
- * "ACTIVE") so space used in the database is minimised. Making your enum names
- * match the database values would give them very short less meaningful names -
- * not a great solution.
- * </p>
- * <p>
- * You can use this annotation to control the mapping of your enums to database
- * values.
- * </p>
- * <p>
- * The design of this using nameValuePairs is not optimal for safety or
- * refactoring so if you have a better solution I'm all ears. The other
- * solutions would probably involve modifying each enumeration with a method
- * which may be ok.
- * </p>
- * <p>
- * An example mapping the UserState enum.
- * </p>
- * 
- * <pre class="code">
- * ...
- * &#064;EnumMapping(nameValuePairs=&quot;NEW=N, ACTIVE=A, INACTIVE=I&quot;)
- *  public enum UserState {
- *  NEW,
- *  ACTIVE,
- *  INACTIVE;
- *  }
- * </pre>
- * 
- * @see EnumValue
- */
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EnumMapping {
-
-  /**
-   * A comma delimited list of name=value pairs.
-   * <p>
-   * e.g. "ACTIVE=A, INACTIVE=I, NEW=N".
-   * </p>
-   * <p>
-   * Where ACTIVE, INACTIVE and NEW are the enumeration values and "A", "I" and
-   * "N" are the database values.
-   * </p>
-   * <p>
-   * This is not really an optimal approach so if you have a better one I'm all
-   * ears - thanks.
-   * </p>
-   */
-  String nameValuePairs();
-
-  /**
-   * Defaults to mapping values to database VARCHAR type. If this is set to true
-   * then the values will be converted to INTEGER and mapped to the database
-   * integer type.
-   * <p>
-   * e.g. "ACTIVE=1, INACTIVE=0, NEW=2".
-   * </p>
-   */
-  boolean integerType() default false;
-
-  /**
-   * The length of DB column if mapping to string values.
-   */
-  int length() default 0;
-}

src/main/java/com/avaje/ebean/annotation/Sql.java

@@ -6,19 +6,13 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Specify explicit sql for multiple select statements. Need to use this if you
- * have more than one SqlSelect for a given bean.
+ * Mark and entity bean that is used solely via RawSql.
  * <p>
- * FUTURE: Support explicit sql for SqlInsert, SqlUpdate and SqlDelete.
+ * This means the entity bean has no base table specified (via @Table).
  * </p>
  */
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Sql {
 
-  /**
-   * The sql select statements.
-   */
-  SqlSelect[] select() default { @SqlSelect };
-
 }

src/main/java/com/avaje/ebean/annotation/SqlSelect.java

@@ -1,298 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.avaje.ebean.Query;
-
-/**
- * Specify an explicit sql select statement to use for querying an entity bean.
- * <p>
- * The reason for using explicit sql is that you want better control over the
- * exact sql or sql that Ebean does not generate for you (such as group by,
- * union, intersection, window functions, recursive queries).
- * </p>
- * <p>
- * An example of two sql select queries deployed on the ReportTopic entity bean.
- * The first one has no name specified so it becomes the default query. The
- * second query extends the first adding a where clause with a named parameter.
- * </p>
- * 
- * <pre class="code">
- * ...
- * &#064;Entity
- *   &#064;Sql(select = {
- *     &#064;SqlSelect(query = 
- *       &quot;select t.id, t.title, count(p.id) as score &quot;+
- *       &quot;from f_topic t &quot;+
- *       &quot;join f_topic_post p on p.topic_id = t.id &quot;+
- *       &quot;group by t.id, t.title&quot;),
- *     &#064;SqlSelect(
- *       name = &quot;with.title&quot;,
- *       extend = &quot;default&quot;,
- *       debug = true,
- *       where = &quot;title like :likeTitle&quot;)
- *  })
- *  public class ReportTopic
- *    &#064;Id Integer id;
- *    String title;
- *    Double score;
- *    ...
- * </pre>
- * 
- * <p>
- * An example using the first "default" query.
- * </p>
- * 
- * <pre class="code">
- * 
- * List&lt;ReportTopic&gt; list =
- *     Ebean.find(ReportTopic.class)
- *         .having().gt(&quot;score&quot;, 0)
- *         .findList();
- * 
- * </pre>
- * 
- * <p>
- * The resulting sql, note the having clause has been added.
- * </p>
- * 
- * <pre class="code">
- * select t.id, t.title, count(p.id) as score 
- * from f_topic t join f_topic_post p on p.topic_id = t.id 
- * group by t.id, t.title  
- * having count(p.id) &gt; ?
- * </pre>
- * 
- * <p>
- * An example using the second query. Note the named parameter "likeTitle" must
- * be set.
- * </p>
- * 
- * <pre class="code">
- * List&lt;ReportTopic&gt; list =
- *     Ebean.find(ReportTopic.class, &quot;with.title&quot;)
- *         .set(&quot;likeTitle&quot;, &quot;a%&quot;)
- *         .findList();
- * </pre>
- * 
- * <p>
- * Ebean tries to parse the sql in the query to determine 4 things
- * <li>Location for inserting WHERE expressions (if required)</li>
- * <li>Location for inserting HAVING expressions (if required)</li>
- * <li>Mapping of columns to bean properties</li>
- * <li>The order by clause</li>
- * </p>
- * <p>
- * If Ebean is unable to parse out this information (perhaps because the sql
- * contains multiple select from keywords etc) then you need to manually specify
- * it.
- * </p>
- * <p>
- * Insert ${where} or ${andWhere} into the location where Ebean can insert any
- * expressions added to the where clause. Use ${andWhere} if the sql already has
- * the WHERE keyword and Ebean will instead start with a AND keyword.
- * </p>
- * <p>
- * Insert ${having} or ${andHaving} into the location where Ebean can insert any
- * expressions added to the having clause. Use ${andHaving} if the sql already
- * has a HAVING keyword and Ebean will instead start with a AND keyword.
- * </p>
- * <p>
- * Use the columnMapping property if Ebean is unable to determine the columns
- * and map them to bean properties.
- * </p>
- * <p>
- * Example with ${andWhere} & ${having}.
- * </p>
- * 
- * <pre class="code">
- *    &#064;SqlSelect(
- *          name = &quot;explicit.where&quot;,
- *          query = 
- *              &quot;select t.id, t.title, count(p.id) as score &quot;+
- *              &quot;from f_topic t, f_topic_post p &quot;+
- *              &quot;where p.topic_id = t.id ${andWhere} &quot;+
- *              &quot;group by t.id, t.title ${having}&quot;),
- * </pre>
- */
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface SqlSelect {
-
-  /**
-   * The name of the query. If left blank this is assumed to be the default
-   * query for this bean type.
-   * <p>
-   * This will default to "default" and in that case becomes the default query
-   * used for the bean.
-   * </p>
-   */
-  String name() default "default";
-
-  /**
-   * The tableAlias used when adding where expressions to the query.
-   */
-  String tableAlias() default "";
-
-  /**
-   * The sql select statement.
-   * <p>
-   * If this query <em>extends</em> another then this string is appended to the
-   * parent query string. Often when using <em>extend</em> you will leave the
-   * query part blank and just specify a where and/or having clauses.
-   * </p>
-   * <p>
-   * This sql <em>CAN NOT</em> contain named parameters. You have to put these
-   * in the separate where and/or having sections.
-   * </p>
-   * <p>
-   * Ebean automatically tries to determine the location in the sql string for
-   * putting in additional where or having clauses. If Ebean is unable to
-   * successfully determine this then you have to explicitly specify these
-   * locations by including
-   * <em>${where} or ${andWhere} and  ${having} or ${andHaving}</em> in the sql.
-   * </p>
-   * <p>
-   * <b>${where}</b> location of where clause (and will add WHERE ... ) <br/>
-   * Use this when there is no where clause in the sql. If expressions are added
-   * to the where clause Ebean will put them in at this location starting with
-   * the WHERE keyword.
-   * <p>
-   * <p>
-   * <b>${andWhere}</b> <br/>
-   * Use this instead of ${where} if there IS an existing where clause in the
-   * sql. Ebean will add the expressions starting with the AND keyword.
-   * <p>
-   * <b>${having}</b> location of having clause (and will add HAVING... ) <br/>
-   * </p>
-   * <p>
-   * <b>${andHaving}</b> <br/>
-   * Use this instead of ${having} when there IS an existing HAVING clause.
-   * Ebean will add the expressions starting with the AND keyword.
-   * </p>
-   * <p>
-   * You can include one of ${where} OR ${andWhere} but not both.
-   * </p>
-   * <p>
-   * You can include one of ${having} OR ${andHaving} but not both.
-   * </p>
-   */
-  String query() default "";
-
-  /**
-   * Specify the name of a sql-select query that this one 'extends'.
-   * <p>
-   * When a query is extended the sql query contents are appended together. The
-   * where and having clauses are NOT appended but overridden.
-   * </p>
-   */
-  String extend() default "";
-
-  /**
-   * Specify a where clause typically containing named parameters.
-   * <p>
-   * If a where clause is specified with named parameters then they will need to
-   * be set on the query via {@link Query#setParameter(String, Object)}.
-   * </p>
-   * <p>
-   * In the example below the query specifies a where clause that includes a
-   * named parameter "likeTitle".
-   * </p>
-   * 
-   * <pre class="code">
-   * ...
-   * &#064;Entity
-   * &#064;Sql(select = {
-   *  ...
-   *  &#064;SqlSelect(
-   *  name = &quot;with.title&quot;,
-   *  extend = &quot;default&quot;,
-   *  debug = true,
-   *  where = &quot;title like :likeTitle&quot;)
-   *  })
-   *  public class ReportTopic
-   *  ...
-   * </pre>
-   * 
-   * <p>
-   * Example use of the above named query.
-   * </p>
-   * 
-   * <pre class="code">
-   * 
-   * Query&lt;ReportTopic&gt; query0 = Ebean.createQuery(ReportTopic.class, &quot;with.title&quot;);
-   * 
-   * query0.set(&quot;likeTitle&quot;, &quot;Bana%&quot;);
-   * 
-   * List&lt;ReportTopic&gt; list0 = query0.findList();
-   * </pre>
-   * 
-   */
-  String where() default "";
-
-  /**
-   * Specify a having clause typically containing named parameters.
-   * <p>
-   * If a having clause is specified with named parameters then they will need
-   * to be set on the query via {@link Query#setParameter(String, Object)}.
-   * </p>
-   */
-  String having() default "";
-
-  /**
-   * (Optional) Explicitly specify column to property mapping.
-   * <p>
-   * This is required when Ebean is unable to parse the sql. This could occur if
-   * the sql contains multiple select keywords etc.
-   * </p>
-   * <p>
-   * Specify the columns and property names they map to in the format.
-   * </p>
-   * 
-   * <pre class="code">
-   *  column1 propertyName1, column2 propertyName2, ...
-   * </pre>
-   * 
-   * <p>
-   * Optionally put a AS keyword between the column and property.
-   * </p>
-   * 
-   * <pre class="code">
-   *   // the AS keyword is optional
-   *  column1 AS propertyName1, column2 propertyName2, ...
-   * </pre>
-   * 
-   * <p>
-   * <b>column</b> should contain the table alias if there is one
-   * </p>
-   * <p>
-   * <b>propertyName</b> should match the property name.
-   * </p>
-   * 
-   * <p>
-   * Example mapping 5 columns to properties.
-   * </p>
-   * 
-   * <pre class="code">
-   * columnMapping=&quot;t.id, t.bug_body description, t.bug_title as title, count(p.id) as scoreValue&quot;,
-   * </pre>
-   * 
-   * <p>
-   * Without this set Ebean will parse the sql looking for the select clause and
-   * try to map the columns to property names. It is expected that Ebean will
-   * not be able to successfully parse some sql and for those cases you should
-   * specify the column to property mapping explicitly.
-   * </p>
-   * 
-   */
-  String columnMapping() default "";
-
-  /**
-   * Set this to true to have debug output when Ebean parses the sql-select.
-   */
-  boolean debug() default false;
-}

src/main/java/com/avaje/ebean/annotation/Transactional.java

@@ -90,6 +90,16 @@ public @interface Transactional {
    */
   int batchSize() default 0;
 
+  /**
+   * Set to false when we want to skip getting generatedKeys.
+   * <p>
+   * This is typically used in the case of large batch inserts where we get a
+   * performance benefit from not calling getGeneratedKeys (as we are going to
+   * insert a lot of rows and have no need for the Id values after the insert).
+   * </p>
+   */
+  boolean getGeneratedKeys() default true;
+
   /**
    * The transaction isolation level this transaction should have.
    * <p>

src/main/java/com/avaje/ebean/annotation/View.java

@@ -0,0 +1,38 @@
+package com.avaje.ebean.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotate an entity bean with @View to indicates the bean is based on a view.
+ * <p>
+ * As such typically the view is defined in <code>extra-ddl.xml</code> using
+ * <code>create or replace view ...</code>.
+ * </p>
+ * <p>
+ * When using extra-ddl.xml Ebean will run the resulting DDL script after the
+ * <code>create-all</code> DDL (which is typically used during development) and for
+ * DB Migration will copy the scripts as <code>repeatable migration scripts</code> that
+ * will be run by FlywayDb (or Ebean's own migration runner) when their MD5 hash changes.
+ * </p>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface View {
+
+  /**
+   * The name of the view this entity bean is based on.
+   */
+  String name();
+
+  /**
+   * Tables this view is dependent on.
+   * <p>
+   * This is used with l2 caching to invalidate the query cache. Changes to these
+   * tables invalidate the query cache for the entity based on this view.
+   * </p>
+   */
+  String[] dependentTables() default {};
+}

src/main/java/com/avaje/ebean/cache/ServerCache.java

@@ -1,7 +1,5 @@
 package com.avaje.ebean.cache;
 
-import com.avaje.ebean.EbeanServer;
-
 /**
  * Represents part of the "L2" server side cache.
  * <p>
@@ -17,27 +15,6 @@ import com.avaje.ebean.EbeanServer;
  */
 public interface ServerCache {
 
-  /**
-   * Just after a cache is created this init method is called. This is so that a
-   * cache implementation can make use of the BackgroundExecutor service to
-   * trim/cleanup itself or use the EbeanServer to populate itself.
-   * <p>
-   * This method is called after the cache is constructed but before the cache
-   * is made available for use.
-   * </p>
-   */
-  void init(EbeanServer ebeanServer);
-
-  /**
-   * Return the configuration options for this cache.
-   */
-  ServerCacheOptions getOptions();
-
-  /**
-   * Update the configuration options for this cache.
-   */
-  void setOptions(ServerCacheOptions options);
-
   /**
    * Return the value given the key.
    */

src/main/java/com/avaje/ebean/cache/ServerCacheFactory.java

@@ -1,26 +1,13 @@
 package com.avaje.ebean.cache;
 
-import com.avaje.ebean.EbeanServer;
-
 /**
  * Defines method for constructing caches for beans and queries.
  */
 public interface ServerCacheFactory {
 
-  /**
-   * Just after the ServerCacheFactory is constructed this method is called
-   * passing the EbeanServer.
-   * <p>
-   * This is so that a cache implementation can utilise the EbeanServer to
-   * populate itself or use the BackgroundExecutor service to schedule periodic
-   * cache trimming/cleanup.
-   * </p>
-   */
-  void init(EbeanServer ebeanServer);
-
   /**
    * Create the cache for the given type with options.
    */
-  ServerCache createCache(String cacheKey, ServerCacheOptions cacheOptions);
+  ServerCache createCache(ServerCacheType type, String cacheKey, ServerCacheOptions cacheOptions);
 
 }

src/main/java/com/avaje/ebean/cache/ServerCacheManager.java

@@ -1,25 +1,10 @@
 package com.avaje.ebean.cache;
 
-import com.avaje.ebean.EbeanServer;
-
 /**
  * The cache service for server side caching of beans and query results.
  */
 public interface ServerCacheManager {
 
-  /**
-   * This method is called just after the construction of the
-   * ServerCacheManager.
-   * <p>
-   * The EbeanServer is provided so that cache implementations can make use of
-   * EbeanServer and BackgroundExecutor for automatically populating and
-   * background trimming of the cache.
-   * </p>
-   */
-  void init(EbeanServer server);
-
-  void setCaching(Class<?> beanType, boolean useCache);
-
   /**
    * Return true if there is an active bean cache for this type of bean.
    */
@@ -35,6 +20,9 @@ public interface ServerCacheManager {
    */
   ServerCache getBeanCache(Class<?> beanType);
 
+  /**
+   * Return the cache for associated many properties of a bean type.
+   */
   ServerCache getCollectionIdsCache(Class<?> beanType, String propertyName);
 
   /**

src/main/java/com/avaje/ebean/cache/ServerCacheOptions.java

@@ -1,6 +1,7 @@
 package com.avaje.ebean.cache;
 
-import com.avaje.ebean.annotation.CacheTuning;
+import com.avaje.ebean.annotation.CacheQueryTuning;
+import com.avaje.ebean.annotation.CacheBeanTuning;
 
 /**
  * Options for controlling a cache.
@@ -22,23 +23,23 @@ public class ServerCacheOptions {
   /**
    * Create from the cacheTuning deployment annotation.
    */
-  public ServerCacheOptions(CacheTuning cacheTuning) {
+  public ServerCacheOptions(CacheBeanTuning tuning) {
+    this.maxSize = tuning.maxSize();
+    this.maxIdleSecs = tuning.maxIdleSecs();
+    this.maxSecsToLive = tuning.maxSecsToLive();
+    this.trimFrequency = tuning.trimFrequency();
+  }
+
+  /**
+   * Create from the cacheTuning deployment annotation.
+   */
+  public ServerCacheOptions(CacheQueryTuning cacheTuning) {
     this.maxSize = cacheTuning.maxSize();
     this.maxIdleSecs = cacheTuning.maxIdleSecs();
     this.maxSecsToLive = cacheTuning.maxSecsToLive();
     this.trimFrequency = cacheTuning.trimFrequency();
   }
 
-  /**
-   * Create merging default options with the deployment specified ones.
-   */
-  public ServerCacheOptions(ServerCacheOptions defaults) {
-    this.maxSize = defaults.getMaxSize();
-    this.maxIdleSecs = defaults.getMaxIdleSecs();
-    this.maxSecsToLive = defaults.getMaxIdleSecs();
-    this.trimFrequency = defaults.getTrimFrequency();
-  }
-
   /**
    * Apply any settings from the default settings that have not already been
    * specifically set.

src/main/java/com/avaje/ebean/cache/ServerCachePlugin.java

@@ -0,0 +1,15 @@
+package com.avaje.ebean.cache;
+
+import com.avaje.ebean.BackgroundExecutor;
+import com.avaje.ebean.config.ServerConfig;
+
+/**
+ * The plugin interface that creates a ServerCacheFactory.
+ */
+public interface ServerCachePlugin {
+
+  /**
+   * Create the ServerCacheFactory given the server config and background executor service.
+   */
+  ServerCacheFactory create(ServerConfig config, BackgroundExecutor executor);
+}

src/main/java/com/avaje/ebean/cache/ServerCacheType.java

@@ -0,0 +1,27 @@
+package com.avaje.ebean.cache;
+
+/**
+ * The type of L2 caches.
+ */
+public enum ServerCacheType {
+
+  /**
+   * Bean cache.
+   */
+  BEAN,
+
+  /**
+   * Natural key cache.
+   */
+  NATURAL_KEY,
+
+  /**
+   * Collection Ids for Many properties.
+   */
+  COLLECTION_IDS,
+
+  /**
+   * Query cache.
+   */
+  QUERY
+}

src/main/java/com/avaje/ebean/config/ClassLoadConfig.java

@@ -1,6 +1,10 @@
 package com.avaje.ebean.config;
 
 
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+
 /**
  * Helper to find classes taking into account the context class loader.
  */
@@ -29,6 +33,13 @@ public class ClassLoadConfig {
     return isPresent("java.time.LocalDate");
   }
 
+  /**
+   * Return true if Java7 is present.
+   */
+  public boolean isJava7Present() {
+    return isPresent("java.nio.file.Path");
+  }
+
   /**
    * Return true if the Joda types are available and should be supported.
    */
@@ -70,6 +81,13 @@ public class ClassLoadConfig {
     }
   }
 
+  /**
+   * Return the resources for the given name.
+   */
+  public Enumeration<URL> getResources(String name) throws IOException {
+    return context.getResources(name);
+  }
+
   /**
    * Return true if the given class is present.
    */
@@ -122,6 +140,13 @@ public class ClassLoadConfig {
       return (loader != null) ? loader: callerLoader;
     }
 
+    Enumeration<URL> getResources(String name) throws IOException {
+      if (preferredLoader != null) {
+        return preferredLoader.getResources(name);
+      }
+      return contextLoader().getResources(name);
+    }
+
     Class<?> forName(String name) throws ClassNotFoundException {
 
       if (preferredLoader != null) {

src/main/java/com/avaje/ebean/config/DbMigrationConfig.java

@@ -6,6 +6,8 @@ import com.avaje.ebean.dbmigration.DbMigration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 /**
  * Configuration for the DB migration processing.
  */
@@ -58,6 +60,11 @@ public class DbMigrationConfig {
 
   protected String applySuffix = ".sql";
 
+  /**
+   * Set this to "V" to be compatible with FlywayDB.
+   */
+  protected String applyPrefix = "";
+
   protected String modelSuffix = ".model.xml";
 
   protected boolean includeGeneratedFileComment;
@@ -67,6 +74,36 @@ public class DbMigrationConfig {
    */
   protected String generatePendingDrop;
 
+  /**
+   * For running migration the DB table that holds migration execution status.
+   */
+  protected String metaTable = "db_migration";
+
+  /**
+   * Flag set to true means to run any outstanding migrations on startup.
+   */
+  protected boolean runMigration;
+
+  /**
+   * Comma and equals delimited key/value placeholders to replace in DDL scripts.
+   */
+  protected String runPlaceholders;
+
+  /**
+   * Map of key/value placeholders to replace in DDL scripts.
+   */
+  protected Map<String,String> runPlaceholderMap;
+
+  /**
+   * DB user used to run the DB migration.
+   */
+  protected String dbUser;
+
+  /**
+   * DB password used to run the DB migration.
+   */
+  protected String dbPassword;
+
   /**
    * Return the DB platform to generate migration DDL for.
    *
@@ -145,6 +182,20 @@ public class DbMigrationConfig {
     this.applySuffix = applySuffix;
   }
 
+  /**
+   * Return the apply prefix.
+   */
+  public String getApplyPrefix() {
+    return applyPrefix;
+  }
+
+  /**
+   * Set the apply prefix. This might be set to "V" for use with FlywayDB.
+   */
+  public void setApplyPrefix(String applyPrefix) {
+    this.applyPrefix = applyPrefix;
+  }
+
   /**
    * Return true if the generated file comment should be included.
    */
@@ -199,10 +250,119 @@ public class DbMigrationConfig {
     this.modelPath = "";
   }
 
+  /**
+   * Return the table name that holds the migration run details
+   * (used by DB Migration runner only).
+   */
+  public String getMetaTable() {
+    return metaTable;
+  }
+
+  /**
+   * Set the table name that holds the migration run details
+   * (used by DB Migration runner only).
+   */
+  public void setMetaTable(String metaTable) {
+    this.metaTable = metaTable;
+  }
+
+  /**
+   * Return a comma and equals delimited placeholders that are substituted in SQL scripts when running migration
+   * (used by DB Migration runner only).
+   */
+  public String getRunPlaceholders() {
+    // environment properties take precedence
+    String placeholders = readEnvironment("ddl.migration.placeholders");
+    if (placeholders != null) {
+      return placeholders;
+    }
+    return runPlaceholders;
+  }
+
+  /**
+   * Set a comma and equals delimited placeholders that are substituted in SQL scripts when running migration
+   * (used by DB Migration runner only).
+   */
+  public void setRunPlaceholders(String runPlaceholders) {
+    this.runPlaceholders = runPlaceholders;
+  }
+
+  /**
+   * Return a map of placeholder values that are substituted in SQL scripts when running migration
+   * (used by DB Migration runner only).
+   */
+  public Map<String, String> getRunPlaceholderMap() {
+    return runPlaceholderMap;
+  }
+
+  /**
+   * Set a map of placeholder values that are substituted when running migration
+   * (used by DB Migration runner only).
+   */
+  public void setRunPlaceholderMap(Map<String, String> runPlaceholderMap) {
+    this.runPlaceholderMap = runPlaceholderMap;
+  }
+
+  /**
+   * Return true if the DB migration should be run on startup.
+   */
+  public boolean isRunMigration() {
+    // environment properties take precedence
+    String run = readEnvironment("ddl.migration.run");
+    if (run != null) {
+      return "true".equalsIgnoreCase(run.trim());
+    }
+    return runMigration;
+  }
+
+  /**
+   * Set to true to run the DB migration on startup.
+   */
+  public void setRunMigration(boolean runMigration) {
+    this.runMigration = runMigration;
+  }
+
+  /**
+   * Return the DB user to use for running DB migrations.
+   */
+  public String getDbUser() {
+    // environment properties take precedence
+    String user = readEnvironment("ddl.migration.user");
+    if (user != null) {
+      return user;
+    }
+    return dbUser;
+  }
+
+  /**
+   * Set the DB user to use for running DB migrations.
+   */
+  public void setDbUser(String dbUser) {
+    this.dbUser = dbUser;
+  }
+
+  /**
+   * Return the DB password to use for running DB migrations.
+   */
+  public String getDbPassword() {
+    String user = readEnvironment("ddl.migration.password");
+    if (user != null) {
+      return user;
+    }
+    return dbPassword;
+  }
+
+  /**
+   * Set the DB password to use for running DB migrations.
+   */
+  public void setDbPassword(String dbPassword) {
+    this.dbPassword = dbPassword;
+  }
+
   /**
    * Load the settings from the PropertiesWrapper.
    */
-  public void loadSettings(PropertiesWrapper properties) {
+  public void loadSettings(PropertiesWrapper properties, String serverName) {
 
     migrationPath = properties.get("migration.migrationPath", migrationPath);
     if (properties.getBoolean("migration.singleDirectory", false)) {
@@ -210,6 +370,7 @@ public class DbMigrationConfig {
     } else {
       modelPath = properties.get("migration.modelPath", modelPath);
     }
+    applyPrefix = properties.get("migration.applyPrefix", applyPrefix);
     applySuffix = properties.get("migration.applySuffix", applySuffix);
     modelSuffix = properties.get("migration.modelSuffix", modelSuffix);
     includeGeneratedFileComment = properties.getBoolean("migration.includeGeneratedFileComment", includeGeneratedFileComment);
@@ -220,6 +381,18 @@ public class DbMigrationConfig {
     generate = properties.getBoolean("migration.generate", generate);
     version = properties.get("migration.version", version);
     name = properties.get("migration.name", name);
+
+    runMigration = properties.getBoolean("migration.run", runMigration);
+    metaTable = properties.get("migration.metaTable", metaTable);
+    runPlaceholders = properties.get("migration.placeholders", runPlaceholders);
+
+    String adminUser = properties.get("datasource."+serverName+".username", dbUser);
+    adminUser = properties.get("datasource."+serverName+".adminusername", adminUser);
+    dbUser = properties.get("migration.dbuser", adminUser);
+
+    String adminPwd = properties.get("datasource."+serverName+".password", dbPassword);
+    adminPwd = properties.get("datasource."+serverName+".adminpassword", adminPwd);
+    dbPassword = properties.get("migration.dbpassword", adminPwd);
   }
 
   /**

src/main/java/com/avaje/ebean/config/IdGenerator.java

@@ -0,0 +1,22 @@
+package com.avaje.ebean.config;
+
+/**
+ * A customer Id generator that can be registered with Ebean and
+ * assigned to @Id properties using the name attribute of @GeneratedValue.
+ */
+public interface IdGenerator {
+
+  /**
+   * Return the next Id value.
+   */
+  Object nextValue();
+
+  /**
+   * Return the name of the IdGenerator.
+   * <p>
+   * The name is used to assign the IdGenerator to a property using
+   * <code>@GeneratedValue(name="myGeneratorName")</code>
+   * </p>
+   */
+  String getName();
+}

src/main/java/com/avaje/ebean/config/ServerConfig.java

@@ -3,8 +3,8 @@ package com.avaje.ebean.config;
 import com.avaje.ebean.EbeanServerFactory;
 import com.avaje.ebean.PersistenceContextScope;
 import com.avaje.ebean.annotation.Encrypted;
-import com.avaje.ebean.cache.ServerCacheFactory;
 import com.avaje.ebean.cache.ServerCacheManager;
+import com.avaje.ebean.cache.ServerCachePlugin;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
 import com.avaje.ebean.config.dbplatform.DbEncrypt;
 import com.avaje.ebean.event.BeanFindController;
@@ -26,8 +26,10 @@ import org.avaje.datasource.DataSourceConfig;
 
 import javax.sql.DataSource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.ServiceLoader;
 
@@ -43,37 +45,36 @@ import java.util.ServiceLoader;
  * includes searching the class path and automatically registering any entity
  * classes and listeners etc.
  * </p>
- * 
+ *
  * <pre>{@code
  * ServerConfig c = new ServerConfig();
  * c.setName("ordh2");
- * 
+ *
  * // read the ebean.properties and load
  * // those settings into this serverConfig object
  * c.loadFromProperties();
- * 
+ *
  * // generate DDL and run it
  * c.setDdlGenerate(true);
  * c.setDdlRun(true);
- * 
+ *
  * // add any classes found in the app.data package
  * c.addPackage("app.data");
- * 
+ *
  * // add the names of Jars that contain entities
  * c.addJar("myJarContainingEntities.jar");
  * c.addJar("someOtherJarContainingEntities.jar");
- * 
+ *
  * // register as the 'Default' server
  * c.setDefaultServer(true);
- * 
+ *
  * EbeanServer server = EbeanServerFactory.create(c);
- * 
+ *
  * }</pre>
- * 
- * @see EbeanServerFactory
- * 
+ *
  * @author emcgreal
  * @author rbygrave
+ * @see EbeanServerFactory
  */
 public class ServerConfig {
 
@@ -82,6 +83,12 @@ public class ServerConfig {
    */
   private String name;
 
+  /**
+   * Typically configuration type objects that are passed by this ServerConfig
+   * to plugins. For example - IgniteConfiguration passed to Ignite plugin.
+   */
+  private Map<String, Object> serviceObject = new HashMap<String, Object>();
+
   private ContainerConfig containerConfig;
 
   /**
@@ -143,7 +150,7 @@ public class ServerConfig {
    */
   private CurrentUserProvider currentUserProvider;
 
-  /** 
+  /**
    * Config controlling the AutoTune behaviour.
    */
   private AutoTuneConfig autoTuneConfig = new AutoTuneConfig();
@@ -159,13 +166,13 @@ public class ServerConfig {
    */
   private JsonConfig.Include jsonInclude = JsonConfig.Include.ALL;
 
-  /** 
-   * The database platform name. Used to imply a DatabasePlatform to use.  
+  /**
+   * The database platform name. Used to imply a DatabasePlatform to use.
    */
   private String databasePlatformName;
 
-  /** 
-   * The database platform. 
+  /**
+   * The database platform.
    */
   private DatabasePlatform databasePlatform;
 
@@ -204,18 +211,23 @@ public class ServerConfig {
 
   private int persistBatchSize = 20;
 
-  /** 
-   * The default batch size for lazy loading 
+  /**
+   * The default batch size for lazy loading
    */
   private int lazyLoadBatchSize = 10;
 
-  /** 
+  /**
    * The default batch size for 'query joins'.
    */
   private int queryBatchSize = 100;
 
   private boolean eagerFetchLobs;
 
+  /**
+   * Timezone used to get/set Timestamp values via JDBC.
+   */
+  private String dataTimeZone;
+
   private boolean ddlGenerate;
 
   private boolean ddlRun;
@@ -234,12 +246,12 @@ public class ServerConfig {
   private ExternalTransactionManager externalTransactionManager;
 
   /**
-   * The data source (if programmatically provided). 
+   * The data source (if programmatically provided).
    */
   private DataSource dataSource;
 
-  /** 
-   * The data source config. 
+  /**
+   * The data source config.
    */
   private DataSourceConfig dataSourceConfig = new DataSourceConfig();
 
@@ -265,23 +277,23 @@ public class ServerConfig {
    */
   private boolean explicitTransactionBeginMode;
 
-  /** 
-   * The data source JNDI name if using a JNDI DataSource. 
+  /**
+   * The data source JNDI name if using a JNDI DataSource.
    */
   private String dataSourceJndiName;
 
-  /** 
+  /**
    * The database boolean true value (typically either 1, T, or Y).
    */
   private String databaseBooleanTrue;
 
-  /** 
-   * The database boolean false value (typically either 0, F or N). 
+  /**
+   * The database boolean false value (typically either 0, F or N).
    */
   private String databaseBooleanFalse;
 
-  /** 
-   * The naming convention. 
+  /**
+   * The naming convention.
    */
   private NamingConvention namingConvention = new UnderscoreNamingConvention();
 
@@ -290,7 +302,7 @@ public class ServerConfig {
    */
   private DbConstraintNaming constraintNaming = new DbConstraintNaming();
 
-  /** 
+  /**
    * Behaviour of update to include on the change properties.
    */
   private boolean updateChangesOnly = true;
@@ -304,13 +316,14 @@ public class ServerConfig {
    * Default behaviour for updates when cascade save on a O2M or M2M to delete any missing children.
    */
   private boolean updatesDeleteMissingChildren = true;
-  
+
   /**
    * Setting to indicate if UUID should be stored as binary(16) or varchar(40) or native DB type (for H2 and Postgres).
    */
   private DbUuid dbUuid = DbUuid.AUTO;
 
 
+  private List<IdGenerator> idGenerators = new ArrayList<IdGenerator>();
   private List<BeanFindController> findControllers = new ArrayList<BeanFindController>();
   private List<BeanPersistController> persistControllers = new ArrayList<BeanPersistController>();
   private List<BeanPostLoad> postLoaders = new ArrayList<BeanPostLoad>();
@@ -343,7 +356,7 @@ public class ServerConfig {
 
   private DbEncrypt dbEncrypt;
 
-  private ServerCacheFactory serverCacheFactory;
+  private ServerCachePlugin serverCachePlugin;
 
   private ServerCacheManager serverCacheManager;
 
@@ -381,13 +394,13 @@ public class ServerConfig {
   private int cacheWarmingDelay = 30;
   private int cacheMaxSize = 10000;
   private int cacheMaxIdleTime = 600;
-  private int cacheMaxTimeToLive = 60*60*6;
+  private int cacheMaxTimeToLive = 60 * 60 * 6;
 
   // defaults for the L2 query caching
 
   private int queryCacheMaxSize = 1000;
   private int queryCacheMaxIdleTime = 600;
-  private int queryCacheMaxTimeToLive = 60*60*6;
+  private int queryCacheMaxTimeToLive = 60 * 60 * 6;
   private Object objectMapper;
 
   /**
@@ -395,15 +408,42 @@ public class ServerConfig {
    */
   private boolean expressionEqualsWithNullAsNoop;
 
+  /**
+   * Set to true to use native ILIKE expression (if support by datasbase platform / like Postgres).
+   */
+  private boolean expressionNativeIlike;
+
   private String jodaLocalTimeMode;
 
+  /**
+   * Set to true to globally disable L2 caching (typically for performance testing).
+   */
+  private boolean disableL2Cache;
+
   /**
    * Construct a Server Configuration for programmatically creating an EbeanServer.
    */
   public ServerConfig() {
 
   }
-  
+
+  /**
+   * Put a service object into configuration such that it can be passed to a plugin.
+   * <p>
+   * For example, put IgniteConfiguration in to be passed to the Ignite plugin.
+   * </p>
+   */
+  public void putServiceObject(String key, Object configObject) {
+    serviceObject.put(key, configObject);
+  }
+
+  /**
+   * Return the service object given the key.
+   */
+  public Object getServiceObject(String key) {
+    return serviceObject.get(key);
+  }
+
   /**
    * Return the Jackson JsonFactory to use.
    * <p>
@@ -630,6 +670,7 @@ public class ServerConfig {
    * <p>
    * You can also set the batch size on the transaction.
    * </p>
+   *
    * @see com.avaje.ebean.Transaction#setBatchSize(int)
    */
   public void setPersistBatchSize(int persistBatchSize) {
@@ -638,7 +679,7 @@ public class ServerConfig {
 
   /**
    * Gets the query batch size. This defaults to 100.
-   * 
+   *
    * @return the query batch size
    */
   public int getQueryBatchSize() {
@@ -647,9 +688,8 @@ public class ServerConfig {
 
   /**
    * Sets the query batch size. This defaults to 100.
-   * 
-   * @param queryBatchSize
-   *          the new query batch size
+   *
+   * @param queryBatchSize the new query batch size
    */
   public void setQueryBatchSize(int queryBatchSize) {
     this.queryBatchSize = queryBatchSize;
@@ -695,8 +735,8 @@ public class ServerConfig {
   /**
    * Return the ChangeLogPrepare.
    * <p>
-   *   This is used to set user context information to the ChangeSet in the
-   *   foreground thread prior to the logging occurring in a background thread.
+   * This is used to set user context information to the ChangeSet in the
+   * foreground thread prior to the logging occurring in a background thread.
    * </p>
    */
   public ChangeLogPrepare getChangeLogPrepare() {
@@ -706,8 +746,8 @@ public class ServerConfig {
   /**
    * Set the ChangeLogPrepare.
    * <p>
-   *   This is used to set user context information to the ChangeSet in the
-   *   foreground thread prior to the logging occurring in a background thread.
+   * This is used to set user context information to the ChangeSet in the
+   * foreground thread prior to the logging occurring in a background thread.
    * </p>
    */
   public void setChangeLogPrepare(ChangeLogPrepare changeLogPrepare) {
@@ -811,6 +851,23 @@ public class ServerConfig {
     this.migrationConfig = migrationConfig;
   }
 
+  /**
+   * Return the time zone to use when reading/writing Timestamps via JDBC.
+   * <p>
+   * When set a Calendar object is used in JDBC calls when reading/writing Timestamp objects.
+   * </p>
+   */
+  public String getDataTimeZone() {
+    return System.getProperty("ebean.dataTimeZone", dataTimeZone);
+  }
+
+  /**
+   * Set the time zone to use when reading/writing Timestamps via JDBC.
+   */
+  public void setDataTimeZone(String dataTimeZone) {
+    this.dataTimeZone = dataTimeZone;
+  }
+
   /**
    * Return the suffix appended to the base table to derive the view that contains the union
    * of the base table and the history table in order to support asOf queries.
@@ -886,17 +943,17 @@ public class ServerConfig {
   }
 
   /**
-   * Return the ServerCacheFactory.
+   * Return the ServerCachePlugin.
    */
-  public ServerCacheFactory getServerCacheFactory() {
-    return serverCacheFactory;
+  public ServerCachePlugin getServerCachePlugin() {
+    return serverCachePlugin;
   }
 
   /**
-   * Set the ServerCacheFactory to use.
+   * Set the ServerCachePlugin to use.
    */
-  public void setServerCacheFactory(ServerCacheFactory serverCacheFactory) {
-    this.serverCacheFactory = serverCacheFactory;
+  public void setServerCachePlugin(ServerCachePlugin serverCachePlugin) {
+    this.serverCachePlugin = serverCachePlugin;
   }
 
   /**
@@ -1251,7 +1308,7 @@ public class ServerConfig {
   public void setDataSourceJndiName(String dataSourceJndiName) {
     this.dataSourceJndiName = dataSourceJndiName;
   }
-  
+
   /**
    * Return true if autoCommit mode is on. This indicates to Ebean to use autoCommit friendly Transactions and TransactionManager.
    */
@@ -1430,12 +1487,11 @@ public class ServerConfig {
    * <p>
    * You can also set this in ebean.proprerties:
    * </p>
-   * 
-   * <pre class="code">
+   *
+   * <pre>{@code
    * # set via ebean.properties
-   * 
    * ebean.encryptKeyManager=com.avaje.tests.basic.encrypt.BasicEncyptKeyManager
-   * </pre>
+   * }</pre>
    */
   public void setEncryptKeyManager(EncryptKeyManager encryptKeyManager) {
     this.encryptKeyManager = encryptKeyManager;
@@ -1558,7 +1614,7 @@ public class ServerConfig {
 
   /**
    * Set to true to generate the "create all" DDL on startup.
-   *
+   * <p>
    * Typically we want this on when we are running tests locally (and often using H2)
    * and we want to create the full DB schema from scratch to run tests.
    */
@@ -1568,7 +1624,7 @@ public class ServerConfig {
 
   /**
    * Set to true to run the generated "create all DDL" on startup.
-   *
+   * <p>
    * Typically we want this on when we are running tests locally (and often using H2)
    * and we want to create the full DB schema from scratch to run tests.
    */
@@ -1578,7 +1634,7 @@ public class ServerConfig {
 
   /**
    * Return true if the "drop all ddl" should be skipped.
-   *
+   * <p>
    * Typically we want to do this when using H2 (in memory) as our test database and the drop statements
    * are not required so skipping the drop table statements etc makes it faster with less noise in the logs.
    */
@@ -1588,7 +1644,7 @@ public class ServerConfig {
 
   /**
    * Set to true if the "drop all ddl" should be skipped.
-   *
+   * <p>
    * Typically we want to do this when using H2 (in memory) as our test database and the drop statements
    * are not required so skipping the drop table statements etc makes it faster with less noise in the logs.
    */
@@ -1599,8 +1655,8 @@ public class ServerConfig {
   /**
    * Return SQL script to execute after the "create all" DDL has been run.
    * <p>
-   *   Typically this is a sql script that inserts test seed data when running tests.
-   *   Place a sql script in src/test/resources that inserts test seed data.
+   * Typically this is a sql script that inserts test seed data when running tests.
+   * Place a sql script in src/test/resources that inserts test seed data.
    * </p>
    */
   public String getDdlSeedSql() {
@@ -1610,8 +1666,8 @@ public class ServerConfig {
   /**
    * Set a SQL script to execute after the "create all" DDL has been run.
    * <p>
-   *   Typically this is a sql script that inserts test seed data when running tests.
-   *   Place a sql script in src/test/resources that inserts test seed data.
+   * Typically this is a sql script that inserts test seed data when running tests.
+   * Place a sql script in src/test/resources that inserts test seed data.
    * </p>
    */
   public void setDdlSeedSql(String ddlSeedSql) {
@@ -1690,10 +1746,9 @@ public class ServerConfig {
    * <p>
    * Alternatively the classes can be added via {@link #setClasses(List)}.
    * </p>
-   * 
-   * @param cls
-   *          the entity type (or other type) that should be registered by this
-   *          server.
+   *
+   * @param cls the entity type (or other type) that should be registered by this
+   *            server.
    */
   public void addClass(Class<?> cls) {
     if (classes == null) {
@@ -1744,13 +1799,13 @@ public class ServerConfig {
    * If you are using ebean.properties you can specify jars to search by setting
    * a ebean.search.jars property.
    * </p>
-   * 
-   * <pre class="code">
-   * # EBean will search through classes for entities, but will not search jar files 
-   * # unless you tell it to do so, for performance reasons.  Set this value to a 
+   *
+   * <pre>{@code
+   * # EBean will search through classes for entities, but will not search jar files
+   * # unless you tell it to do so, for performance reasons.  Set this value to a
    * # comma-delimited list of jar files you want ebean to search.
    * ebean.search.jars=example.jar
-   * </pre>
+   * }</pre>
    */
   public void addJar(String jarName) {
     if (searchJars == null) {
@@ -1788,7 +1843,7 @@ public class ServerConfig {
 
   /**
    * Set the class name of a classPathReader implementation.
-   *
+   * <p>
    * Refer to server.util.ClassPathReader, this should really by a plugin but doing this for now
    * to be relatively compatible with current implementation.
    */
@@ -1843,7 +1898,7 @@ public class ServerConfig {
   /**
    * Set to false if by default updates in JDBC batch should not include all properties.
    * <p>
-   *   This mode can be explicitly set per transaction.
+   * This mode can be explicitly set per transaction.
    * </p>
    *
    * @see com.avaje.ebean.Transaction#setUpdateAllLoadedProperties(boolean)
@@ -1886,6 +1941,7 @@ public class ServerConfig {
    * <p>
    * This information can be later retrieved via {@link MetaInfoManager}.
    * </p>
+   *
    * @see MetaInfoManager
    */
   public void setCollectQueryStatsByNode(boolean collectQueryStatsByNode) {
@@ -1906,6 +1962,7 @@ public class ServerConfig {
    * <p>
    * This information can be later retrieved via {@link MetaInfoManager}.
    * </p>
+   *
    * @see MetaInfoManager
    */
   public void setCollectQueryOrigins(boolean collectQueryOrigins) {
@@ -1955,6 +2012,27 @@ public class ServerConfig {
     this.queryAdapters = queryAdapters;
   }
 
+  /**
+   * Return the custom IdGenerator instances.
+   */
+  public List<IdGenerator> getIdGenerators() {
+    return idGenerators;
+  }
+
+  /**
+   * Set the custom IdGenerator instances.
+   */
+  public void setIdGenerators(List<IdGenerator> idGenerators) {
+    this.idGenerators = idGenerators;
+  }
+
+  /**
+   * Register a customer IdGenerator instance.
+   */
+  public void add(IdGenerator idGenerator) {
+    idGenerators.add(idGenerator);
+  }
+
   /**
    * Register a BeanPersistController instance.
    * <p>
@@ -2219,7 +2297,7 @@ public class ServerConfig {
    * @param instance   existing instance
    */
   @SuppressWarnings("unchecked")
-  protected  <T> T createInstance(PropertiesWrapper properties, Class<T> pluginType, String key, T instance) {
+  protected <T> T createInstance(PropertiesWrapper properties, Class<T> pluginType, String key, T instance) {
 
     if (instance != null) {
       return instance;
@@ -2230,8 +2308,9 @@ public class ServerConfig {
 
   /**
    * Return the instance to use (can be null) for the given plugin.
+   *
    * @param pluginType the type of plugin
-   * @param classname the implementation class as per properties
+   * @param classname  the implementation class as per properties
    */
   protected <T> T createInstance(Class<T> pluginType, String classname) {
     return classname == null ? null : (T) classLoadConfig.newInstance(classname);
@@ -2267,7 +2346,7 @@ public class ServerConfig {
    */
   protected void loadSettings(PropertiesWrapper p) {
 
-    migrationConfig.loadSettings(p);
+    migrationConfig.loadSettings(p, name);
 
     namingConvention = createNamingConvention(p, namingConvention);
     if (namingConvention != null) {
@@ -2288,6 +2367,7 @@ public class ServerConfig {
     }
     loadDocStoreSettings(p);
 
+    disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
     explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);
     autoCommitMode = p.getBoolean("autoCommitMode", autoCommitMode);
     useJtaTransactionManager = p.getBoolean("useJtaTransactionManager", useJtaTransactionManager);
@@ -2299,11 +2379,11 @@ public class ServerConfig {
     encryptDeployManager = createInstance(p, EncryptDeployManager.class, "encryptDeployManager", encryptDeployManager);
     encryptor = createInstance(p, Encryptor.class, "encryptor", encryptor);
     dbEncrypt = createInstance(p, DbEncrypt.class, "dbEncrypt", dbEncrypt);
-    serverCacheFactory = createInstance(p, ServerCacheFactory.class, "serverCacheFactory", serverCacheFactory);
+    serverCachePlugin = createInstance(p, ServerCachePlugin.class, "serverCachePlugin", serverCachePlugin);
     serverCacheManager = createInstance(p, ServerCacheManager.class, "serverCacheManager", serverCacheManager);
     cacheWarmingDelay = p.getInt("cacheWarmingDelay", cacheWarmingDelay);
     classPathReaderClassName = p.get("classpathreader");
-    
+
     String jarsProp = p.get("search.jars", p.get("jars", null));
     if (jarsProp != null) {
       searchJars = getSearchJarsPackages(jarsProp);
@@ -2319,7 +2399,7 @@ public class ServerConfig {
 
     updateAllPropertiesInBatch = p.getBoolean("updateAllPropertiesInBatch", updateAllPropertiesInBatch);
     updateChangesOnly = p.getBoolean("updateChangesOnly", updateChangesOnly);
-    
+
     boolean defaultDeleteMissingChildren = p.getBoolean("defaultDeleteMissingChildren", updatesDeleteMissingChildren);
     updatesDeleteMissingChildren = p.getBoolean("updatesDeleteMissingChildren", defaultDeleteMissingChildren);
 
@@ -2337,7 +2417,9 @@ public class ServerConfig {
 
     changeLogIncludeInserts = p.getBoolean("changeLogIncludeInserts", changeLogIncludeInserts);
     expressionEqualsWithNullAsNoop = p.getBoolean("expressionEqualsWithNullAsNoop", expressionEqualsWithNullAsNoop);
+    expressionNativeIlike = p.getBoolean("expressionNativeIlike", expressionNativeIlike);
 
+    dataTimeZone = p.get("dataTimeZone", dataTimeZone);
     asOfViewSuffix = p.get("asOfViewSuffix", asOfViewSuffix);
     asOfSysPeriod = p.get("asOfSysPeriod", asOfSysPeriod);
     historyTableSuffix = p.get("historyTableSuffix", historyTableSuffix);
@@ -2381,10 +2463,8 @@ public class ServerConfig {
 
   /**
    * Build the list of classes from the comma delimited string.
-   * 
-   * @param properties
-   *          the properties
-   * 
+   *
+   * @param properties the properties
    * @return the classes
    */
   private List<Class<?>> getClasses(PropertiesWrapper properties) {
@@ -2467,15 +2547,43 @@ public class ServerConfig {
   /**
    * Set to true if you want eq("someProperty", null) to generate "1=1" rather than "is null" sql expression.
    * <p>
-   *   Setting this to true has the effect that eq(propertyName, value), ieq(propertyName, value) and
-   *   ne(propertyName, value) have no effect when the value is null. The expression factory adds a NoopExpression
-   *   which will add "1=1" into the SQL rather than "is null".
+   * Setting this to true has the effect that eq(propertyName, value), ieq(propertyName, value) and
+   * ne(propertyName, value) have no effect when the value is null. The expression factory adds a NoopExpression
+   * which will add "1=1" into the SQL rather than "is null".
    * </p>
    */
   public void setExpressionEqualsWithNullAsNoop(boolean expressionEqualsWithNullAsNoop) {
     this.expressionEqualsWithNullAsNoop = expressionEqualsWithNullAsNoop;
   }
 
+  /**
+   * Return true if native ILIKE expression should be used if supported by the database platform (e.g. Postgres).
+   */
+  public boolean isExpressionNativeIlike() {
+    return expressionNativeIlike;
+  }
+
+  /**
+   * Set to true to use native ILIKE expression if supported by the database platform (e.g. Postgres).
+   */
+  public void setExpressionNativeIlike(boolean expressionNativeIlike) {
+    this.expressionNativeIlike = expressionNativeIlike;
+  }
+
+  /**
+   * Return true if L2 cache is disabled.
+   */
+  public boolean isDisableL2Cache() {
+    return disableL2Cache;
+  }
+
+  /**
+   * Set to true to disable L2 caching. Typically useful in performance testing.
+   */
+  public void setDisableL2Cache(boolean disableL2Cache) {
+    this.disableL2Cache = disableL2Cache;
+  }
+
   /**
    * Specify how UUID is stored.
    */

src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlAnsiLimiter.java

@@ -0,0 +1,24 @@
+package com.avaje.ebean.config.dbplatform;
+
+/**
+ * Adds ANSI based OFFSET FETCH NEXT clauses to a SQL query.
+ */
+public class BasicSqlAnsiLimiter implements BasicSqlLimiter {
+
+  @Override
+  public String limit(String dbSql, int firstRow, int maxRows) {
+
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
+
+    sb.append(dbSql);
+    if (firstRow > 0) {
+      sb.append(" ").append("offset");
+      sb.append(" ").append(firstRow).append(" rows");
+    }
+    if (maxRows > 0) {
+      sb.append(" fetch next ").append(maxRows).append(" rows only");
+    }
+    return sb.toString();
+  }
+
+}

src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffset.java

@@ -0,0 +1,36 @@
+package com.avaje.ebean.config.dbplatform;
+
+/**
+ * Adds LIMIT OFFSET clauses to a SQL query.
+ */
+public class BasicSqlLimitOffset implements BasicSqlLimiter {
+
+  /**
+   * LIMIT keyword.
+   */
+  private static final String LIMIT = "limit";
+
+  /**
+   * OFFSET keyword.
+   */
+  private static final String OFFSET = "offset";
+
+  @Override
+  public String limit(String dbSql, int firstRow, int maxRows) {
+
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
+
+    sb.append(dbSql);
+
+    if (maxRows > 0) {
+      sb.append(" ").append(LIMIT);
+      sb.append(" ").append(maxRows);
+    }
+    if (firstRow > 0) {
+      sb.append(" ").append(OFFSET).append(" ");
+      sb.append(firstRow);
+    }
+    return sb.toString();
+  }
+
+}

src/main/java/com/avaje/ebean/config/dbplatform/BasicSqlLimiter.java

@@ -0,0 +1,12 @@
+package com.avaje.ebean.config.dbplatform;
+
+/**
+ * Simple SQL limiter for use with SqlQuery.
+ */
+public interface BasicSqlLimiter {
+
+  /**
+   * Add basic offset/limit clause to SqlQuery query.
+   */
+  String limit(String dbSql, int firstRow, int maxRows);
+}

src/main/java/com/avaje/ebean/config/dbplatform/DB2Platform.java

@@ -34,8 +34,8 @@ public class DB2Platform extends DatabasePlatform {
    * sequence values.
    */
   @Override
-  public IdGenerator createSequenceIdGenerator(BackgroundExecutor be,
-      DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be,
+                                                       DataSource ds, String seqName, int batchSize) {
 
     return new DB2SequenceIdGenerator(be, ds, seqName, batchSize);
   }

src/main/java/com/avaje/ebean/config/dbplatform/DatabasePlatform.java

@@ -9,7 +9,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Types;
+import java.util.Properties;
 
 /**
  * Database platform specific settings.
@@ -66,6 +71,11 @@ public class DatabasePlatform {
    */
   protected SqlLimiter sqlLimiter = new LimitOffsetSqlLimiter();
 
+  /**
+   * Limit/offset support for SqlQuery only.
+   */
+  protected BasicSqlLimiter basicSqlLimiter = new BasicSqlLimitOffset();
+
   /**
    * Mapping of JDBC to Database types.
    */
@@ -165,12 +175,18 @@ public class DatabasePlatform {
    */
   protected int maxConstraintNameLength = 60;
 
+  protected boolean supportsNativeIlike;
+
   /**
    * Instantiates a new database platform.
    */
   public DatabasePlatform() {
   }
 
+  public void configure(Properties properties) {
+    // by default do nothing
+  }
+
   /**
    * Return the name of the DatabasePlatform.
    * <p>
@@ -182,6 +198,13 @@ public class DatabasePlatform {
     return name;
   }
 
+  /**
+   * Return true if this database platform supports native ILIKE expression.
+   */
+  public boolean isSupportsNativeIlike() {
+    return supportsNativeIlike;
+  }
+
   /**
    * Return the maximum table name length.
    * <p>
@@ -233,7 +256,7 @@ public class DatabasePlatform {
    * @param seqName   the name of the sequence
    * @param batchSize the number of sequences that should be loaded
    */
-  public IdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
     return null;
   }
 
@@ -436,6 +459,13 @@ public class DatabasePlatform {
     return sqlLimiter;
   }
 
+  /**
+   * Return the BasicSqlLimiter for limit/offset of SqlQuery queries.
+   */
+  public BasicSqlLimiter getBasicSqlLimiter() {
+    return basicSqlLimiter;
+  }
+
   /**
    * Set the DB TRUE literal (from the registered boolean ScalarType)
    */
@@ -522,4 +552,28 @@ public class DatabasePlatform {
     return disallowBatchOnCascade;
   }
 
+  /**
+   * Return true if the table exists.
+   */
+  public boolean tableExists(Connection connection, String catalog, String schema, String table) throws SQLException {
+
+    DatabaseMetaData metaData = connection.getMetaData();
+    ResultSet tables = metaData.getTables(catalog, schema, table, null);
+    try {
+      return tables.next();
+    } finally {
+      close(tables);
+    }
+  }
+
+  /**
+   * Close the resultSet.
+   */
+  protected void close(ResultSet resultSet) {
+    try {
+      resultSet.close();
+    } catch (SQLException e) {
+      logger.error("Error closing resultSet", e);
+    }
+  }
 }

src/main/java/com/avaje/ebean/config/dbplatform/DbType.java

@@ -117,14 +117,26 @@ public class DbType {
    *          the scale defined by deployment on a specific property.
    */
   public String renderType(int deployLength, int deployScale) {
+    return renderType(deployLength, deployScale, true);
+  }
+
+  /**
+   * Render the type defining strict mode.
+   * <p>
+   * If strict mode if OFF then this will render with a scale value even if
+   * that is not strictly supported. The reason for supporting this is to enable
+   * use to use types like jsonb(200) as a "logical" type that maps to JSONB for
+   * Postgres and VARCHAR(200) for other databases.
+   * </p>
+   */
+  public String renderType(int deployLength, int deployScale, boolean strict) {
 
     StringBuilder sb = new StringBuilder();
     sb.append(name);
 
-    if (canHaveLength) {
+    if (canHaveLength || !strict) {
       // see if there is a precision/scale to add (or not)
       int len = deployLength != 0 ? deployLength : defaultLength;
-
       if (len > 0) {
         sb.append("(");
         sb.append(len);

src/main/java/com/avaje/ebean/config/dbplatform/DbTypeMap.java

@@ -49,6 +49,7 @@ public class DbTypeMap {
     lookup.put("TIME", Types.TIME);
     lookup.put("TIMESTAMP", Types.TIMESTAMP);
 
+    lookup.put("ARRAY", Types.ARRAY);
     lookup.put("UUID", DbType.UUID);
 
     // Not standard java.sql.Types
@@ -105,12 +106,13 @@ public class DbTypeMap {
 
     // DB native UUID support (H2 and Postgres)
     put(DbType.UUID, new DbType("uuid"));
+    put(Types.ARRAY, new DbType("array"));
 
     if (logicalTypes) {
       // keep it logical for 2 layer DDL generation
-      put(DbType.HSTORE, new DbType("hstore"));
-      put(DbType.JSON, new DbType("json"));
-      put(DbType.JSONB, new DbType("jsonb"));
+      put(DbType.HSTORE, new DbType("hstore", false));
+      put(DbType.JSON, new DbType("json", false));
+      put(DbType.JSONB, new DbType("jsonb", false));
       put(DbType.JSONClob, new DbType("jsonclob"));
       put(DbType.JSONBlob, new DbType("jsonblob"));
       put(DbType.JSONVarchar, new DbType("jsonvarchar", 1000));
@@ -137,7 +139,7 @@ public class DbTypeMap {
   /**
    * Lookup the platform specific DbType given the standard sql type name.
    */
-  public DbType lookup(String name) {
+  public DbType lookup(String name, boolean withScale) {
     name = name.trim().toUpperCase();
     Integer typeKey = lookup.get(name);
     if (typeKey == null) {
@@ -152,18 +154,19 @@ public class DbTypeMap {
       case DbType.JSONVarchar:
         return get(Types.VARCHAR);
       case DbType.JSON:
-        return getJsonType(DbType.JSON);
+        return getJsonType(DbType.JSON, withScale);
       case DbType.JSONB:
-        return getJsonType(DbType.JSONB);
+        return getJsonType(DbType.JSONB, withScale);
       default:
         return get(typeKey);
     }
   }
 
-  private DbType getJsonType(int type) {
+  private DbType getJsonType(int type, boolean withScale) {
     DbType dbType = get(type);
     if (dbType == JSON_CLOB_PLACEHOLDER) {
-      return get(Types.CLOB);
+      // if we have scale that implies this maps to varchar
+      return withScale ? get(Types.VARCHAR) : get(Types.CLOB);
     }
     if (dbType == JSON_BLOB_PLACEHOLDER) {
       return get(Types.BLOB);

src/main/java/com/avaje/ebean/config/dbplatform/H2Platform.java

@@ -39,8 +39,8 @@ public class H2Platform extends DatabasePlatform {
    * sequence values.
    */
   @Override
-  public IdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds,
-      String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds,
+                                                       String seqName, int batchSize) {
 
     return new H2SequenceIdGenerator(be, ds, seqName, batchSize);
   }

src/main/java/com/avaje/ebean/config/dbplatform/HsqldbPlatform.java

@@ -26,7 +26,7 @@ public class HsqldbPlatform extends DatabasePlatform {
   }
 
   @Override
-  public IdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
 
     return new H2SequenceIdGenerator(be, ds, seqName, batchSize);
   }

src/main/java/com/avaje/ebean/config/dbplatform/MySqlPlatform.java

@@ -52,8 +52,8 @@ public class MySqlPlatform extends DatabasePlatform {
    * Return null in case there is a sequence annotation.
    */
   @Override
-  public IdGenerator createSequenceIdGenerator(BackgroundExecutor be,
-      DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be,
+                                                       DataSource ds, String seqName, int batchSize) {
 
     return null;
   }

src/main/java/com/avaje/ebean/config/dbplatform/OraclePlatform.java

@@ -18,6 +18,7 @@ public class OraclePlatform extends DatabasePlatform {
     this.maxConstraintNameLength = 30;
     this.dbEncrypt = new OracleDbEncrypt();
     this.sqlLimiter = new RownumSqlLimiter();
+    this.basicSqlLimiter = new BasicSqlAnsiLimiter();
     this.platformDdl = new Oracle10Ddl(this);
     this.historySupport = new OracleDbHistorySupport();
 
@@ -54,7 +55,7 @@ public class OraclePlatform extends DatabasePlatform {
   }
 
   @Override
-  public IdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
 
     return new OracleSequenceIdGenerator(be, ds, seqName, batchSize);
   }

src/main/java/com/avaje/ebean/config/dbplatform/PlatformIdGenerator.java

@@ -11,7 +11,7 @@ import com.avaje.ebean.Transaction;
  * actual insert.
  * </p>
  */
-public interface IdGenerator {
+public interface PlatformIdGenerator {
 
   /**
    * The name of the default UUID generator.

src/main/java/com/avaje/ebean/config/dbplatform/PostgresPlatform.java

@@ -7,6 +7,7 @@ import com.avaje.ebean.dbmigration.ddlgeneration.platform.PostgresDdl;
 
 import javax.sql.DataSource;
 import java.sql.Types;
+import java.util.Properties;
 
 /**
  * Postgres v9 specific platform.
@@ -19,6 +20,7 @@ public class PostgresPlatform extends DatabasePlatform {
   public PostgresPlatform() {
     super();
     this.name = "postgres";
+    this.supportsNativeIlike = true;
     this.likeClause = "like ? escape''";
     this.selectCountWithAlias = true;
     this.blobDbType = Types.LONGVARBINARY;
@@ -42,14 +44,15 @@ public class PostgresPlatform extends DatabasePlatform {
     DbType dbTypeText = new DbType("text");
     DbType dbBytea = new DbType("bytea", false);
 
-    dbTypeMap.put(DbType.HSTORE, new DbType("hstore"));
-    dbTypeMap.put(DbType.JSON, new DbType("json"));
-    dbTypeMap.put(DbType.JSONB, new DbType("jsonb"));
+    dbTypeMap.put(DbType.HSTORE, new DbType("hstore", false));
+    dbTypeMap.put(DbType.JSON, new DbType("json", false));
+    dbTypeMap.put(DbType.JSONB, new DbType("jsonb", false));
 
     dbTypeMap.put(Types.INTEGER, new DbType("integer", false));
     dbTypeMap.put(Types.DOUBLE, new DbType("float"));
     dbTypeMap.put(Types.TINYINT, new DbType("smallint"));
     dbTypeMap.put(Types.DECIMAL, new DbType("decimal", 38));
+    dbTypeMap.put(Types.TIMESTAMP, new DbType("timestamptz"));
 
     dbTypeMap.put(Types.BINARY, dbBytea);
     dbTypeMap.put(Types.VARBINARY, dbBytea);
@@ -58,7 +61,16 @@ public class PostgresPlatform extends DatabasePlatform {
     dbTypeMap.put(Types.CLOB, dbTypeText);
     dbTypeMap.put(Types.LONGVARBINARY, dbBytea);
     dbTypeMap.put(Types.LONGVARCHAR, dbTypeText);
+  }
 
+  @Override
+  public void configure(Properties properties) {
+    super.configure(properties);
+    String tsType = properties.getProperty("ebean.postgres.timestamp");
+    if (tsType != null) {
+      // set timestamp type to "timestamp" without time zone
+      dbTypeMap.put(Types.TIMESTAMP, new DbType(tsType));
+    }
   }
 
   /**
@@ -72,7 +84,7 @@ public class PostgresPlatform extends DatabasePlatform {
    * Create a Postgres specific sequence IdGenerator.
    */
   @Override
-  public IdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
 
     return new PostgresSequenceIdGenerator(be, ds, seqName, batchSize);
   }

src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java

@@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Database sequence based IdGenerator.
  */
-public abstract class SequenceIdGenerator implements IdGenerator {
+public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   private static final Logger logger = LoggerFactory.getLogger(SequenceIdGenerator.class);
 

src/main/java/com/avaje/ebean/config/dbplatform/SimpleSequenceIdGenerator.java

@@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory;
  * One which batch requests sequence Id's would be better for performance.
  * </p>
  */
-public class SimpleSequenceIdGenerator implements IdGenerator {
+public class SimpleSequenceIdGenerator implements PlatformIdGenerator {
 
   private static final Logger logger = LoggerFactory.getLogger(SimpleSequenceIdGenerator.class);
 

src/main/java/com/avaje/ebean/config/dbplatform/SqlAnywhereLimiter.java

@@ -1,8 +1,7 @@
 package com.avaje.ebean.config.dbplatform;
 
 /**
- * Use top xx and start at xx to limit sql results. Based on
- * MsSqlServer2005SqlLimiter and LimitOffsetSqlLimiter
+ * Use top xx and start at xx to limit sql results.
  */
 public class SqlAnywhereLimiter implements SqlLimiter {
 

src/main/java/com/avaje/ebean/dbmigration/DbMigration.java

@@ -25,10 +25,14 @@ import com.avaje.ebean.dbmigration.model.ModelContainer;
 import com.avaje.ebean.dbmigration.model.ModelDiff;
 import com.avaje.ebean.dbmigration.model.PlatformDdlWriter;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import com.avaje.ebeaninternal.extraddl.model.DdlScript;
+import com.avaje.ebeaninternal.extraddl.model.ExtraDdl;
+import com.avaje.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +46,7 @@ import java.util.List;
  * and drop objects (drop tables, drop columns).
  * </p>
  * <p>
- *   This does not run the migration or ddl scripts but just generates them.
+ * This does not run the migration or ddl scripts but just generates them.
  * </p>
  * <pre>{@code
  *
@@ -98,7 +102,7 @@ public class DbMigration {
 
   /**
    * Set the path from the current working directory to the application resources.
-   *
+   * <p>
    * This defaults to maven style 'src/main/resources'.
    */
   public void setPathToResources(String pathToResources) {
@@ -169,7 +173,7 @@ public class DbMigration {
   /**
    * Generate the next migration xml file and associated apply and rollback sql scripts.
    * <p>
-   *   This does not run the migration or ddl scripts but just generates them.
+   * This does not run the migration or ddl scripts but just generates them.
    * </p>
    * <h3>Example: Run for a single specific platform</h3>
    * <pre>{@code
@@ -181,7 +185,7 @@ public class DbMigration {
    *       migration.generateMigration();
    *
    * }</pre>
-   *
+   * <p>
    * <h3>Example: Run migration generating DDL for multiple platforms</h3>
    * <pre>{@code
    *
@@ -206,6 +210,8 @@ public class DbMigration {
     try {
       Request request = createRequest();
 
+      generateExtraDdl(request);
+
       String pendingVersion = generatePendingDrop();
       if (pendingVersion != null) {
         generatePendingDrop(request, pendingVersion);
@@ -220,6 +226,49 @@ public class DbMigration {
     }
   }
 
+  /**
+   * Generate "repeatable" migration scripts.
+   * <p>
+   * These take scrips from extra-dll.xml (typically views) and outputs "repeatable"
+   * migration scripts (starting with "R__") to be run by FlywayDb or Ebean's own
+   * migration runner.
+   * </p>
+   */
+  private void generateExtraDdl(Request request) throws IOException {
+
+    if (databasePlatform != null) {
+      ExtraDdl extraDdl = ExtraDdlXmlReader.read("/extra-ddl.xml");
+      if (extraDdl != null) {
+        List<DdlScript> ddlScript = extraDdl.getDdlScript();
+        for (DdlScript script : ddlScript) {
+          if (ExtraDdlXmlReader.matchPlatform(databasePlatform.getName(), script.getPlatforms())) {
+            writeExtraDdl(request, script);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Write (or override) the "repeatable" migration script.
+   */
+  private void writeExtraDdl(Request request, DdlScript script) throws IOException {
+
+    String fullName = repeatableMigrationName(script.getName());
+
+    logger.info("writing repeatable script {}", fullName);
+
+    File file = new File(request.migrationDir, fullName);
+    FileWriter writer = new FileWriter(file);
+    writer.write(script.getValue());
+    writer.flush();
+    writer.close();
+  }
+
+  private String repeatableMigrationName(String scriptName) {
+    return "R__" + scriptName.replace(' ', '_') + migrationConfig.getApplySuffix();
+  }
+
   /**
    * Generate the diff migration.
    */
@@ -319,7 +368,7 @@ public class DbMigration {
         // history ddl generation (triggers, history tables etc)
         DdlWrite write = new DdlWrite(new MConfiguration(), request.current);
         PlatformDdlWriter writer = createDdlWriter(databasePlatform, "");
-        writer.processMigration(dbMigration, write, request.migrationDir , fullVersion);
+        writer.processMigration(dbMigration, write, request.migrationDir, fullVersion);
       }
       writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir);
     }
@@ -339,7 +388,7 @@ public class DbMigration {
 
   /**
    * Return the full version for the migration being generated.
-   *
+   * <p>
    * The full version can contain a comment suffix after a "__" double underscore.
    */
   private String getFullVersion(MigrationModel migrationModel, String dropsFor) {
@@ -349,7 +398,7 @@ public class DbMigration {
       version = migrationModel.getNextVersion(initialVersion);
     }
 
-    String fullVersion = version;
+    String fullVersion = migrationConfig.getApplyPrefix() + version;
     if (migrationConfig.getName() != null) {
       fullVersion += "__" + toUnderScore(migrationConfig.getName());
 
@@ -366,7 +415,7 @@ public class DbMigration {
    * Replace spaces with underscores.
    */
   private String toUnderScore(String name) {
-    return name.replace(' ','_');
+    return name.replace(' ', '_');
   }
 
   /**
@@ -444,7 +493,7 @@ public class DbMigration {
    */
   protected File getModelDirectory(File migrationDirectory) {
     String modelPath = migrationConfig.getModelPath();
-    if (modelPath ==  null || modelPath.isEmpty()) {
+    if (modelPath == null || modelPath.isEmpty()) {
       return migrationDirectory;
     }
     File modelDir = new File(migrationDirectory, migrationConfig.getModelPath());

src/main/java/com/avaje/ebean/dbmigration/DdlGenerator.java

@@ -1,8 +1,10 @@
 package com.avaje.ebean.dbmigration;
 
+import com.avaje.ebean.Transaction;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.dbmigration.model.CurrentModel;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import com.avaje.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
 
 import javax.persistence.PersistenceException;
 import java.io.File;
@@ -13,6 +15,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.Reader;
+import java.sql.Connection;
+import java.sql.SQLException;
 
 /**
  * Controls the generation and execution of "Create All" and "Drop All" DDL scripts.
@@ -81,6 +85,28 @@ public class DdlGenerator {
     }
   }
 
+  /**
+   * Execute all the DDL statements in the script.
+   */
+  public int runScript(boolean expectErrors, String content, String scriptName) {
+
+    DdlRunner runner = new DdlRunner(expectErrors, scriptName);
+
+    Transaction transaction = server.createTransaction();
+    Connection connection = transaction.getConnection();
+    try {
+      int count = runner.runAll(content, connection);
+      transaction.commit();
+      return count;
+
+    } catch (SQLException e) {
+      throw new PersistenceException("Failed to run script", e);
+
+    } finally {
+      transaction.end();
+    }
+  }
+
   protected void runDropSql() throws IOException {
     if (!createOnly) {
       if (dropAllContent == null) {
@@ -95,6 +121,14 @@ public class DdlGenerator {
       createAllContent = readFile(getCreateFileName());
     }
     runScript(false, createAllContent, getCreateFileName());
+
+    String ignoreExtraDdl = System.getProperty("ebean.ignoreExtraDdl");
+    if (!"true".equalsIgnoreCase(ignoreExtraDdl)) {
+      String extraApply = ExtraDdlXmlReader.buildExtra(server.getDatabasePlatform().getName());
+      if (extraApply != null) {
+        runScript(false, extraApply, "extra-dll");
+      }
+    }
   }
 
   protected void runInitSql() throws IOException {
@@ -110,9 +144,8 @@ public class DdlGenerator {
     if (sqlScript != null) {
       InputStream is = getClassLoader().getResourceAsStream(sqlScript);
       if (is != null) {
-        DdlRunner runner = new DdlRunner(false, sqlScript);
         String content = readContent(new InputStreamReader(is));
-        runner.runAll(content, server);
+        runScript(false, content, sqlScript);
       }
     }
   }
@@ -221,13 +254,4 @@ public class DdlGenerator {
     }
   }
 
-  /**
-   * Execute all the DDL statements in the script.
-   */
-  public int runScript(boolean expectErrors, String content, String scriptName) {
-
-    DdlRunner runner = new DdlRunner(expectErrors, scriptName);
-    return runner.runAll(content, server);
-  }
-
 }

src/main/java/com/avaje/ebean/dbmigration/DdlRunner.java

@@ -1,11 +1,8 @@
 package com.avaje.ebean.dbmigration;
 
-import com.avaje.ebean.Transaction;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.PersistenceException;
 import java.io.StringReader;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -20,11 +17,11 @@ public class DdlRunner {
 
   protected static final Logger logger = LoggerFactory.getLogger(DdlRunner.class);
 
-  protected DdlParser ddlParser = new DdlParser();
+  private DdlParser ddlParser = new DdlParser();
 
-  protected final String scriptName;
+  private final String scriptName;
 
-  protected final boolean expectErrors;
+  private final boolean expectErrors;
 
   /**
    * Construct with a script name (for logging) and flag indicating if errors are expected.
@@ -37,36 +34,16 @@ public class DdlRunner {
   /**
    * Parse the content into sql statements and execute them in a transaction.
    */
-  public int runAll(String content, SpiEbeanServer server) {
+  public int runAll(String content, Connection connection) throws SQLException {
 
     List<String> statements = ddlParser.parse(new StringReader(content));
-    return runStatements(statements, server);
+    return runStatements(statements, connection);
   }
 
   /**
    * Execute all the statements in a single transaction.
    */
-  public int runStatements(List<String> statements, SpiEbeanServer server) {
-
-    Transaction t = server.createTransaction();
-    try {
-      int statementCount = runStatements(expectErrors, statements, t.getConnection());
-      t.commit();
-
-      return statementCount;
-
-    } catch (Exception e) {
-      throw new PersistenceException("Error: " + e.getMessage(), e);
-
-    } finally {
-      t.end();
-    }
-  }
-
-  /**
-   * Execute the list of statements.
-   */
-  private int runStatements(boolean expectErrors, List<String> statements, Connection c) {
+  private int runStatements(List<String> statements, Connection connection) throws SQLException {
 
     List<String> noDuplicates = new ArrayList<String>();
 
@@ -80,7 +57,7 @@ public class DdlRunner {
 
     for (int i = 0; i < noDuplicates.size(); i++) {
       String xOfy = (i + 1) + " of " + noDuplicates.size();
-      runStatement(expectErrors, xOfy, noDuplicates.get(i), c);
+      runStatement(expectErrors, xOfy, noDuplicates.get(i), connection);
     }
 
     return noDuplicates.size();
@@ -89,7 +66,7 @@ public class DdlRunner {
   /**
    * Execute the statement.
    */
-  private void runStatement(boolean expectErrors, String oneOf, String stmt, Connection c) {
+  private void runStatement(boolean expectErrors, String oneOf, String stmt, Connection c) throws SQLException {
 
     PreparedStatement pstmt = null;
     try {
@@ -109,12 +86,12 @@ public class DdlRunner {
       pstmt = c.prepareStatement(stmt);
       pstmt.execute();
 
-    } catch (Exception e) {
+    } catch (SQLException e) {
       if (expectErrors) {
         logger.debug(" ... ignoring error executing " + getSummary(stmt) + "  error: " + e.getMessage());
       } else {
         String msg = "Error executing stmt[" + stmt + "] error[" + e.getMessage() + "]";
-        throw new RuntimeException(msg, e);
+        throw new SQLException(msg, e);
       }
 
     } finally {

src/main/java/com/avaje/ebean/dbmigration/MigrationRunner.java

@@ -0,0 +1,111 @@
+package com.avaje.ebean.dbmigration;
+
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.config.DbMigrationConfig;
+import com.avaje.ebean.config.ServerConfig;
+import com.avaje.ebean.dbmigration.runner.LocalMigrationResource;
+import com.avaje.ebean.dbmigration.runner.LocalMigrationResources;
+import com.avaje.ebean.dbmigration.runner.MigrationTable;
+import com.avaje.ebeaninternal.util.JdbcClose;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * Runs the DB migration typically on application start.
+ */
+public class MigrationRunner {
+
+  public static final Logger logger = LoggerFactory.getLogger("org.avaje.ebean.DbMigration");
+
+  private final EbeanServer server;
+
+  private final ServerConfig config;
+
+  private final DbMigrationConfig migrationConfig;
+
+  public MigrationRunner(EbeanServer server, DbMigrationConfig migrationConfig) {
+    this.server = server;
+    this.config = server.getPluginApi().getServerConfig();
+    this.migrationConfig = migrationConfig;
+  }
+
+  /**
+   * Run the migrations if there are any that need running.
+   */
+  public void run() {
+
+    LocalMigrationResources resources = new LocalMigrationResources(config, migrationConfig);
+    if (!resources.readResources()) {
+      logger.debug("no migrations to check");
+      return;
+    }
+
+    String migrationUser = migrationConfig.getDbUser();
+    String migrationPwd = migrationConfig.getDbPassword();
+    if (migrationUser == null) {
+      throw new IllegalStateException("No DB migration user specified (to run the db migration) ?");
+    }
+
+    DataSource dataSource = server.getPluginApi().getDataSource();
+    if (dataSource == null) {
+      throw new IllegalStateException("No dataSource when trying to run migration? "
+          +"Maybe trying to generate DBMigration when ebean.migration.run=true is set? "
+          +"Perhaps need to set ebean.migration.run=false in test-ebean.properties?");
+    }
+
+    Connection connection;
+    try {
+      connection = dataSource.getConnection(migrationUser, migrationPwd);
+    } catch (SQLException e) {
+      throw new IllegalArgumentException("Error trying to connect to database using DB Migration user [" + migrationUser + "]", e);
+    }
+
+    try {
+      logger.debug("using db user [{}] to run migrations ...");
+      connection.setAutoCommit(false);
+      runMigrations(resources, connection);
+
+      connection.commit();
+
+    } catch (Exception e) {
+      JdbcClose.rollback(connection);
+      throw new RuntimeException(e);
+
+    } finally {
+      JdbcClose.close(connection);
+    }
+  }
+
+  /**
+   * Run all the migrations as needed.
+   */
+  private void runMigrations(LocalMigrationResources resources, Connection connection) throws SQLException, IOException {
+
+    MigrationTable table = new MigrationTable(server, migrationConfig, connection);
+    table.createIfNeeded();
+
+    // get the migrations in version order
+    List<LocalMigrationResource> localVersions = resources.getVersions();
+
+    logger.info("local migrations:{}  existing migrations:{}", localVersions.size(), table.size());
+
+    LocalMigrationResource priorVersion = null;
+
+    // run migrations in order
+    for (int i = 0; i < localVersions.size(); i++) {
+      LocalMigrationResource localVersion = localVersions.get(i);
+      if (!table.shouldRun(localVersion, priorVersion)) {
+        break;
+      }
+      priorVersion = localVersion;
+      connection.commit();
+    }
+  }
+
+}

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandler.java

@@ -5,6 +5,7 @@ import com.avaje.ebean.dbmigration.ddlgeneration.platform.BaseTableDdl;
 import com.avaje.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
 import com.avaje.ebean.dbmigration.migration.AddColumn;
 import com.avaje.ebean.dbmigration.migration.AddHistoryTable;
+import com.avaje.ebean.dbmigration.migration.AddTableComment;
 import com.avaje.ebean.dbmigration.migration.AlterColumn;
 import com.avaje.ebean.dbmigration.migration.ChangeSet;
 import com.avaje.ebean.dbmigration.migration.CreateIndex;
@@ -37,6 +38,8 @@ public class BaseDdlHandler implements DdlHandler {
         generate(writer, (CreateTable) change);
       } else if (change instanceof DropTable) {
         generate(writer, (DropTable) change);
+      } else if (change instanceof AddTableComment) {
+        generate(writer, (AddTableComment) change);
       } else if (change instanceof CreateIndex) {
         generate(writer, (CreateIndex) change);
       } else if (change instanceof DropIndex) {
@@ -70,6 +73,11 @@ public class BaseDdlHandler implements DdlHandler {
     tableDdl.generate(writer, dropTable);
   }
 
+  @Override
+  public void generate(DdlWrite writer, AddTableComment addTableComment) throws IOException {
+    tableDdl.generate(writer, addTableComment);
+  }
+
   @Override
   public void generate(DdlWrite writer, AddColumn addColumn) throws IOException {
     tableDdl.generate(writer, addColumn);

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/DdlHandler.java

@@ -2,6 +2,7 @@ package com.avaje.ebean.dbmigration.ddlgeneration;
 
 import com.avaje.ebean.dbmigration.migration.AddColumn;
 import com.avaje.ebean.dbmigration.migration.AddHistoryTable;
+import com.avaje.ebean.dbmigration.migration.AddTableComment;
 import com.avaje.ebean.dbmigration.migration.AlterColumn;
 import com.avaje.ebean.dbmigration.migration.ChangeSet;
 import com.avaje.ebean.dbmigration.migration.CreateIndex;
@@ -14,6 +15,7 @@ import com.avaje.ebean.dbmigration.migration.DropTable;
 import java.io.IOException;
 
 /**
+ * DDL generation interface.
  */
 public interface DdlHandler {
 
@@ -23,6 +25,8 @@ public interface DdlHandler {
 
   void generate(DdlWrite writer, DropTable dropTable) throws IOException;
 
+  void generate(DdlWrite writer, AddTableComment addTableComment) throws IOException;
+
   void generate(DdlWrite writer, AddColumn addColumn) throws IOException;
 
   void generate(DdlWrite writer, DropColumn dropColumn) throws IOException;

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/TableDdl.java

@@ -2,6 +2,7 @@ package com.avaje.ebean.dbmigration.ddlgeneration;
 
 import com.avaje.ebean.dbmigration.migration.AddColumn;
 import com.avaje.ebean.dbmigration.migration.AddHistoryTable;
+import com.avaje.ebean.dbmigration.migration.AddTableComment;
 import com.avaje.ebean.dbmigration.migration.AlterColumn;
 import com.avaje.ebean.dbmigration.migration.CreateIndex;
 import com.avaje.ebean.dbmigration.migration.CreateTable;
@@ -42,6 +43,11 @@ public interface TableDdl {
    */
   void generate(DdlWrite writer, DropColumn dropColumn) throws IOException;
 
+  /**
+   * Write the AddTableComment change.
+   */
+  void generate(DdlWrite writer, AddTableComment addTableComment) throws IOException;
+
   /**
    * Write the AddHistoryTable change.
    */

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java

@@ -10,6 +10,7 @@ import com.avaje.ebean.dbmigration.ddlgeneration.TableDdl;
 import com.avaje.ebean.dbmigration.ddlgeneration.platform.util.IndexSet;
 import com.avaje.ebean.dbmigration.migration.AddColumn;
 import com.avaje.ebean.dbmigration.migration.AddHistoryTable;
+import com.avaje.ebean.dbmigration.migration.AddTableComment;
 import com.avaje.ebean.dbmigration.migration.AlterColumn;
 import com.avaje.ebean.dbmigration.migration.Column;
 import com.avaje.ebean.dbmigration.migration.CreateIndex;
@@ -554,6 +555,13 @@ public class BaseTableDdl implements TableDdl {
     }
   }
 
+  @Override
+  public void generate(DdlWrite writer, AddTableComment addTableComment) throws IOException {
+    if (hasValue(addTableComment.getComment())) {
+      platformDdl.addTableComment(writer.apply(), addTableComment.getName(), addTableComment.getComment());
+    }
+  }
+
   /**
    * Add add column DDL.
    */
@@ -634,7 +642,16 @@ public class BaseTableDdl implements TableDdl {
     if (hasValue(alterColumn.getUniqueOneToOne())) {
       alterColumnAddUniqueOneToOneConstraint(writer, alterColumn);
     }
+    if (hasValue(alterColumn.getComment())) {
+      alterColumnComment(writer, alterColumn);
+    }
 
+    boolean alterCheckConstraint = hasValue(alterColumn.getCheckConstraint());
+
+    if (alterCheckConstraint) {
+      // drop constraint before altering type etc
+      dropCheckConstraint(writer, alterColumn);
+    }
     boolean alterBaseAttributes = false;
     if (hasValue(alterColumn.getType())) {
       alterColumnType(writer, alterColumn);
@@ -648,10 +665,17 @@ public class BaseTableDdl implements TableDdl {
       alterColumnNotnull(writer, alterColumn);
       alterBaseAttributes = true;
     }
-
     if (alterBaseAttributes) {
       alterColumnBaseAttributes(writer, alterColumn);
     }
+    if (alterCheckConstraint) {
+      // add constraint last (after potential type change)
+      addCheckConstraint(writer, alterColumn);
+    }
+  }
+
+  private void alterColumnComment(DdlWrite writer, AlterColumn alterColumn) throws IOException {
+    platformDdl.addColumnComment(writer.apply(), alterColumn.getTableName(), alterColumn.getColumnName(), alterColumn.getComment());
   }
 
   /**
@@ -705,6 +729,22 @@ public class BaseTableDdl implements TableDdl {
     }
   }
 
+  protected void dropCheckConstraint(DdlWrite writer, AlterColumn alter) throws IOException {
+
+    String ddl = platformDdl.alterTableDropConstraint(alter.getTableName(), alter.getCheckConstraintName());
+    if (hasValue(ddl)) {
+      writer.apply().append(ddl).endOfStatement();
+    }
+  }
+
+  protected void addCheckConstraint(DdlWrite writer, AlterColumn alter) throws IOException {
+
+    String ddl = platformDdl.alterTableAddCheckConstraint(alter.getTableName(), alter.getCheckConstraintName(), alter.getCheckConstraint());
+    if (hasValue(ddl)) {
+      writer.apply().append(ddl).endOfStatement();
+    }
+  }
+
   protected void alterColumnNotnull(DdlWrite writer, AlterColumn alter) throws IOException {
 
     String ddl = platformDdl.alterColumnNotnull(alter.getTableName(), alter.getColumnName(), alter.isNotnull());

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java

@@ -131,11 +131,11 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
   }
 
   protected String historyTableName(String baseTableName) {
-    return normalise(baseTableName) + historySuffix;
+    return baseTableName + historySuffix;
   }
 
   protected String procedureName(String baseTableName) {
-    return normalise(baseTableName) + "_history_version";
+    return baseTableName + "_history_version";
   }
 
   protected String triggerName(String baseTableName) {

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java

@@ -38,8 +38,13 @@ public class MySqlDdl extends PlatformDdl {
   }
 
   @Override
-  public String alterColumnType(String tableName, String columnName, String type) {
+  public String alterTableDropConstraint(String tableName, String constraintName) {
+    // drop constraint not supported
+    return null;
+  }
 
+  @Override
+  public String alterColumnType(String tableName, String columnName, String type) {
     // can't alter itself - done in alterColumnBaseAttributes()
     return null;
   }

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl.java

@@ -67,8 +67,12 @@ public class PlatformDdl {
 
   protected String alterColumn = "alter column";
 
+  protected String dropConstraint = "drop constraint";
+
   protected String dropUniqueConstraint = "drop constraint";
 
+  protected String addConstraint = "add constraint";
+
   protected String columnSetType = "";
 
   protected String columnSetDefault = "set default";
@@ -327,12 +331,19 @@ public class PlatformDdl {
   }
 
   /**
-   * Drop a unique constraint from the table.
+   * Drop a unique constraint from the table (Sometimes this is an index).
    */
   public String alterTableDropUniqueConstraint(String tableName, String uniqueConstraintName) {
     return "alter table " + tableName + " " + dropUniqueConstraint + " " + uniqueConstraintName;
   }
 
+  /**
+   * Drop a unique constraint from the table.
+   */
+  public String alterTableDropConstraint(String tableName, String constraintName) {
+    return "alter table " + tableName + " " + dropConstraint + " " + constraintName;
+  }
+
   /**
    * Add a unique constraint to the table.
    * <p>
@@ -377,6 +388,14 @@ public class PlatformDdl {
     return "alter table " + tableName + " " + alterColumn + " " + columnName + " " + suffix;
   }
 
+  /**
+   * Alter table adding the check constraint.
+   */
+  public String alterTableAddCheckConstraint(String tableName, String checkConstraintName, String checkConstraint) {
+
+    return "alter table " + tableName + " " + addConstraint + " " + checkConstraintName + " " + checkConstraint;
+  }
+
   /**
    * Return true if the default value is the special DROP DEFAULT value.
    */

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PostgresDdl.java

@@ -13,6 +13,7 @@ public class PostgresDdl extends PlatformDdl {
     this.dropTableCascade = " cascade";
     this.columnSetType = "type ";
     this.alterTableIfExists = "if exists ";
+    this.columnSetNull = "drop not null";
   }
 
   /**

src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java

@@ -47,7 +47,7 @@ public class PlatformTypeConverter {
     String suffix = close + 1 < columnDefinition.length() ? columnDefinition.substring(close + 1) : "";
     String type = columnDefinition.substring(0, open);
     try {
-      DbType dbType = platformTypes.lookup(type);
+      DbType dbType = platformTypes.lookup(type, true);
       int comma = columnDefinition.indexOf(',', open);
       if (comma > -1) {
         // scale and precision - decimal(10,4)
@@ -73,7 +73,7 @@ public class PlatformTypeConverter {
   protected String convertNoScale(String columnDefinition) {
 
     try {
-      DbType dbType = platformTypes.lookup(columnDefinition);
+      DbType dbType = platformTypes.lookup(columnDefinition, false);
       return dbType.renderType(0, 0);
 
     } catch (IllegalArgumentException e) {

src/main/java/com/avaje/ebean/dbmigration/migration/AddTableComment.java

@@ -0,0 +1,87 @@
+
+package com.avaje.ebean.dbmigration.migration;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="comment" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "addTableComment")
+public class AddTableComment {
+
+    @XmlAttribute(name = "name", required = true)
+    protected String name;
+    @XmlAttribute(name = "comment", required = true)
+    protected String comment;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the comment property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the value of the comment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setComment(String value) {
+        this.comment = value;
+    }
+
+}

src/main/java/com/avaje/ebean/dbmigration/migration/AlterColumn.java

@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlType;
  *       <attribute name="currentDefaultValue" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="notnull" type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *       <attribute name="currentNotnull" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       <attribute name="comment" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="historyExclude" type="{http://www.w3.org/2001/XMLSchema}boolean" />
  *       <attribute name="checkConstraint" type="{http://www.w3.org/2001/XMLSchema}string" />
  *       <attribute name="checkConstraintName" type="{http://www.w3.org/2001/XMLSchema}string" />
@@ -68,6 +69,8 @@ public class AlterColumn {
     protected Boolean notnull;
     @XmlAttribute(name = "currentNotnull")
     protected Boolean currentNotnull;
+    @XmlAttribute(name = "comment")
+    protected String comment;
     @XmlAttribute(name = "historyExclude")
     protected Boolean historyExclude;
     @XmlAttribute(name = "checkConstraint")
@@ -309,6 +312,30 @@ public class AlterColumn {
         this.currentNotnull = value;
     }
 
+    /**
+     * Gets the value of the comment property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getComment() {
+        return comment;
+    }
+
+    /**
+     * Sets the value of the comment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setComment(String value) {
+        this.comment = value;
+    }
+
     /**
      * Gets the value of the historyExclude property.
      * 

src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java

@@ -52,6 +52,7 @@ public class ChangeSet {
         @XmlElement(name = "createTable", type = CreateTable.class),
         @XmlElement(name = "dropTable", type = DropTable.class),
         @XmlElement(name = "renameTable", type = RenameTable.class),
+        @XmlElement(name = "addTableComment", type = AddTableComment.class),
         @XmlElement(name = "addHistoryTable", type = AddHistoryTable.class),
         @XmlElement(name = "dropHistoryTable", type = DropHistoryTable.class),
         @XmlElement(name = "addColumn", type = AddColumn.class),
@@ -98,6 +99,7 @@ public class ChangeSet {
      * {@link CreateTable }
      * {@link DropTable }
      * {@link RenameTable }
+     * {@link AddTableComment }
      * {@link AddHistoryTable }
      * {@link DropHistoryTable }
      * {@link AddColumn }

src/main/java/com/avaje/ebean/dbmigration/migration/ObjectFactory.java

@@ -101,6 +101,14 @@ public class ObjectFactory {
         return new DefaultTablespace();
     }
 
+    /**
+     * Create an instance of {@link AddTableComment }
+     * 
+     */
+    public AddTableComment createAddTableComment() {
+        return new AddTableComment();
+    }
+
     /**
      * Create an instance of {@link RenameTable }
      * 

src/main/java/com/avaje/ebean/dbmigration/model/MColumn.java

@@ -260,7 +260,7 @@ public class MColumn {
     return c;
   }
 
-  private boolean different(String val1, String val2) {
+  protected static boolean different(String val1, String val2) {
     return (val1 == null) ? val2 != null : !val1.equals(val2);
   }
 
@@ -314,10 +314,13 @@ public class MColumn {
         alter.setDefaultValue(newColumn.defaultValue);
       }
     }
-
+    if (different(comment, newColumn.comment)) {
+      AlterColumn alter = getAlterColumn(tableName, tableWithHistory);
+      alter.setComment(newColumn.comment);
+    }
     if (different(checkConstraint, newColumn.checkConstraint)) {
       AlterColumn alter = getAlterColumn(tableName, tableWithHistory);
-      if (hasValue(checkConstraint)) {
+      if (hasValue(checkConstraint) && !hasValue(newColumn.checkConstraint)) {
         alter.setDropCheckConstraint(checkConstraintName);
       }
       if (hasValue(newColumn.checkConstraint)) {

src/main/java/com/avaje/ebean/dbmigration/model/MTable.java

@@ -2,6 +2,7 @@ package com.avaje.ebean.dbmigration.model;
 
 import com.avaje.ebean.dbmigration.migration.AddColumn;
 import com.avaje.ebean.dbmigration.migration.AddHistoryTable;
+import com.avaje.ebean.dbmigration.migration.AddTableComment;
 import com.avaje.ebean.dbmigration.migration.AlterColumn;
 import com.avaje.ebean.dbmigration.migration.Column;
 import com.avaje.ebean.dbmigration.migration.CreateTable;
@@ -285,6 +286,13 @@ public class MTable {
     if (addColumn != null) {
       modelDiff.addAddColumn(addColumn);
     }
+
+    if (MColumn.different(comment, newTable.comment)) {
+      AddTableComment addTableComment = new AddTableComment();
+      addTableComment.setName(name);
+      addTableComment.setComment(newTable.comment);
+      modelDiff.addTableComment(addTableComment);
+    }
   }
 
   /**

src/main/java/com/avaje/ebean/dbmigration/model/MigrationVersion.java

@@ -7,6 +7,10 @@ import java.util.Arrays;
  */
 public class MigrationVersion implements Comparable<MigrationVersion> {
 
+  private static final int[] REPEAT_ORDERING = {Integer.MAX_VALUE};
+
+  private static final boolean[] REPEAT_UNDERSCORES = {false};
+
   /**
    * The raw version text.
    */
@@ -21,6 +25,19 @@ public class MigrationVersion implements Comparable<MigrationVersion> {
 
   private final String comment;
 
+  /**
+   * Construct for "repeatable" version.
+   */
+  private MigrationVersion(String raw, String comment) {
+    this.raw = raw;
+    this.comment = comment;
+    this.ordering = REPEAT_ORDERING;
+    this.underscores = REPEAT_UNDERSCORES;
+  }
+
+  /**
+   * Construct for "normal" version.
+   */
   private MigrationVersion(String raw, int[] ordering, boolean[] underscores, String comment) {
     this.raw = raw;
     this.ordering = ordering;
@@ -28,6 +45,20 @@ public class MigrationVersion implements Comparable<MigrationVersion> {
     this.comment = comment;
   }
 
+  /**
+   * Return true if this is a "repeatable" version.
+   */
+  public boolean isRepeatable() {
+    return ordering == REPEAT_ORDERING;
+  }
+
+  /**
+   * Return the full version.
+   */
+  public String getFull() {
+    return raw;
+  }
+
   public String toString() {
     return raw;
   }
@@ -69,11 +100,15 @@ public class MigrationVersion implements Comparable<MigrationVersion> {
 
   /**
    * Returns the version part of the string.
-   *
+   * <p>
    * Normalised means always use '.' delimiters (no underscores).
    * NextVersion means bump/increase the last version number by 1.
    */
   private String formattedVersion(boolean normalised, boolean nextVersion) {
+
+    if (ordering == REPEAT_ORDERING) {
+      return "R";
+    }
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < ordering.length; i++) {
       if (i < ordering.length - 1) {
@@ -103,8 +138,7 @@ public class MigrationVersion implements Comparable<MigrationVersion> {
         return (ordering[i] > other.ordering[i]) ? 1 : -1;
       }
     }
-    // considered the same
-    return 0;
+    return comment.compareTo(other.comment);
   }
 
   /**
@@ -119,6 +153,10 @@ public class MigrationVersion implements Comparable<MigrationVersion> {
    */
   public static MigrationVersion parse(String raw) {
 
+    if (raw.startsWith("V") || raw.startsWith("v")) {
+      raw = raw.substring(1);
+    }
+
     String comment = "";
     String value = raw;
     int commentStart = raw.indexOf("__");
@@ -130,7 +168,12 @@ public class MigrationVersion implements Comparable<MigrationVersion> {
 
     value = value.replace('_', '.');
 
-    String[] sections = value.split("\\.");
+    String[] sections = value.split("[\\.-]");
+
+    if ("r".equalsIgnoreCase(sections[0])) {
+      // a "repeatable" version (does not have a version number)
+      return new MigrationVersion(raw, comment);
+    }
 
     boolean[] underscores = new boolean[sections.length];
     int[] ordering = new int[sections.length];

src/main/java/com/avaje/ebean/dbmigration/model/ModelDiff.java

@@ -2,6 +2,7 @@ package com.avaje.ebean.dbmigration.model;
 
 import com.avaje.ebean.dbmigration.migration.AddColumn;
 import com.avaje.ebean.dbmigration.migration.AddHistoryTable;
+import com.avaje.ebean.dbmigration.migration.AddTableComment;
 import com.avaje.ebean.dbmigration.migration.AlterColumn;
 import com.avaje.ebean.dbmigration.migration.ChangeSet;
 import com.avaje.ebean.dbmigration.migration.ChangeSetType;
@@ -237,4 +238,11 @@ public class ModelDiff {
   public void addCreateIndex(CreateIndex createIndex) {
     applyChanges.add(createIndex);
   }
+
+  /**
+   * Add a table comment to the 'apply' changes.
+   */
+  public void addTableComment(AddTableComment addTableComment) {
+    applyChanges.add(addTableComment);
+  }
 }

src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java

@@ -108,12 +108,15 @@ public class ModelBuildContext {
   }
 
 
-  public String getColumnDefn(BeanProperty p) {
+  /**
+   * Render the DB type for this property given the strict mode.
+   */
+  public String getColumnDefn(BeanProperty p, boolean strict) {
     DbType dbType = getDbType(p);
     if (dbType == null) {
       throw new IllegalStateException("Unknown DbType mapping for " + p.getFullBeanName());
     }
-    return p.renderDbType(dbType);
+    return p.renderDbType(dbType, strict);
   }
 
   private DbType getDbType(BeanProperty p) {

src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java

@@ -107,7 +107,7 @@ public class ModelBuildIntersectionTable {
 			throw new RuntimeException("Could not find id property for " + findPropColumn);
 		}
 
-    MColumn col = new MColumn(column, ctx.getColumnDefn(p), true);
+    MColumn col = new MColumn(column, ctx.getColumnDefn(p, true), true);
     col.setPrimaryKey(true);
     table.addColumn(col);
 	}

src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java

@@ -184,7 +184,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       if (importedProperty == null) {
         throw new RuntimeException("Imported BeanProperty not found?");
       }
-      String columnDefn = ctx.getColumnDefn(importedProperty);
+      String columnDefn = ctx.getColumnDefn(importedProperty, true);
       String refColumn = importedProperty.getDbColumn();
 
       MColumn col = table.addColumn(dbCol, columnDefn, !p.isNullable());
@@ -229,7 +229,9 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       return;
     }
 
-    MColumn col = new MColumn(p.getDbColumn(), ctx.getColumnDefn(p));
+    // using non-strict mode to render the DB type such that we have a
+    // "logical" type like jsonb(200) that can map to JSONB or VARCHAR(200)
+    MColumn col = new MColumn(p.getDbColumn(), ctx.getColumnDefn(p, false));
     col.setDefaultValue(p.getDbColumnDefault());
     col.setComment(p.getDbComment());
     col.setDraftOnly(p.isDraftOnly());

src/main/java/com/avaje/ebean/dbmigration/model/visitor/VisitAllUsing.java

@@ -39,7 +39,7 @@ public class VisitAllUsing {
 
   public void visitAllBeans() {
     for (BeanDescriptor<?> desc : descriptors) {
-      if (desc.getBaseTable() != null) {
+      if (desc.isBaseTable()) {
         visitBean(desc, visitor);
       }
     }
@@ -150,8 +150,8 @@ public class VisitAllUsing {
     }
 
     public void visit(InheritInfo inheritInfo) {
-      BeanProperty[] propertiesLocal = inheritInfo.getBeanDescriptor().propertiesLocal();
-      for (int i = 0; i <propertiesLocal.length ; i++) {
+      BeanProperty[] propertiesLocal = inheritInfo.desc().propertiesLocal();
+      for (int i = 0; i < propertiesLocal.length; i++) {
         owner.visit(pv, propertiesLocal[i]);
       }
     }

src/main/java/com/avaje/ebean/dbmigration/runner/Checksum.java

@@ -0,0 +1,32 @@
+package com.avaje.ebean.dbmigration.runner;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.zip.CRC32;
+
+/**
+ * Calculates the checksum for the given string content.
+ */
+public class Checksum {
+
+  /**
+   * Returns the checksum of this string.
+   */
+  public static int calculate(String str) {
+
+    final CRC32 crc32 = new CRC32();
+
+    BufferedReader bufferedReader = new BufferedReader(new StringReader(str));
+    try {
+      String line;
+      while ((line = bufferedReader.readLine()) != null) {
+        crc32.update(line.getBytes("UTF-8"));
+      }
+    } catch (IOException e) {
+      throw new RuntimeException("Failed to calculate checksum", e);
+    }
+
+    return (int) crc32.getValue();
+  }
+}

src/main/java/com/avaje/ebean/dbmigration/runner/LocalMigrationResource.java

@@ -0,0 +1,101 @@
+package com.avaje.ebean.dbmigration.runner;
+
+import com.avaje.ebean.dbmigration.model.MigrationVersion;
+import org.avaje.classpath.scanner.Resource;
+
+/**
+ * A DB migration resource (DDL script with version).
+ */
+public class LocalMigrationResource implements Comparable<LocalMigrationResource> {
+
+  /**
+   * Code for repeatable migrations.
+   */
+  private static final String REPEAT_TYPE = "R";
+
+  /**
+   * Code for version migrations.
+   */
+  private static final String VERSION_TYPE = "V";
+
+  private final MigrationVersion version;
+
+  private final String location;
+
+  private final Resource resource;
+
+  /**
+   * Construct with version and resource.
+   */
+  public LocalMigrationResource(MigrationVersion version, String location, Resource resource) {
+    this.version = version;
+    this.location = location;
+    this.resource = resource;
+  }
+
+  public String toString() {
+    return version.toString();
+  }
+
+  /**
+   * Return true if the underlying version is "repeatable".
+   */
+  public boolean isRepeatable() {
+    return version.isRepeatable();
+  }
+
+  /**
+   * Return the "key" that identifies the migration.
+   */
+  public String key() {
+    if (isRepeatable()) {
+      return version.getComment().toLowerCase();
+    } else {
+      return version.normalised();
+    }
+  }
+
+  /**
+   * Return the migration comment.
+   */
+  public String getComment() {
+    String comment = version.getComment();
+    return (comment == null || comment.isEmpty()) ? "-" : comment;
+  }
+
+  /**
+   * Default ordering by version.
+   */
+  @Override
+  public int compareTo(LocalMigrationResource o) {
+    return version.compareTo(o.version);
+  }
+
+  /**
+   * Return the underlying migration version.
+   */
+  public MigrationVersion getVersion() {
+    return version;
+  }
+
+  /**
+   * Return the resource location.
+   */
+  public String getLocation() {
+    return location;
+  }
+
+  /**
+   * Return the content for the migration apply ddl script.
+   */
+  public String getContent() {
+    return resource.loadAsString("UTF-8");
+  }
+
+  /**
+   * Return the type code ("R" or "V") for this migration.
+   */
+  public String getType() {
+    return isRepeatable() ? REPEAT_TYPE : VERSION_TYPE;
+  }
+}

src/main/java/com/avaje/ebean/dbmigration/runner/LocalMigrationResources.java

@@ -0,0 +1,91 @@
+package com.avaje.ebean.dbmigration.runner;
+
+import com.avaje.ebean.config.DbMigrationConfig;
+import com.avaje.ebean.config.ServerConfig;
+import com.avaje.ebean.dbmigration.model.MigrationVersion;
+import org.avaje.classpath.scanner.Resource;
+import org.avaje.classpath.scanner.ResourceFilter;
+import org.avaje.classpath.scanner.Scanner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Loads the DB migration resources and sorts them into execution order.
+ */
+public class LocalMigrationResources {
+
+  private static final Logger logger = LoggerFactory.getLogger(LocalMigrationResources.class);
+
+  private final ServerConfig serverConfig;
+
+  private final DbMigrationConfig migrationConfig;
+
+  private final List<LocalMigrationResource> versions = new ArrayList<LocalMigrationResource>();
+
+  /**
+   * Construct with configuration options.
+   */
+  public LocalMigrationResources(ServerConfig serverConfig, DbMigrationConfig migrationConfig) {
+    this.serverConfig = serverConfig;
+    this.migrationConfig = migrationConfig;
+  }
+
+  /**
+   * Read all the migration resources (SQL scripts) returning true if there are versions.
+   */
+  public boolean readResources() {
+
+    String migrationPath = migrationConfig.getMigrationPath();
+
+    ClassLoader classLoader = serverConfig.getClassLoadConfig().getClassLoader();
+
+    Scanner scanner = new Scanner(classLoader);
+    List<Resource> resourceList = scanner.scanForResources(migrationPath, new Match(migrationConfig));
+
+    logger.debug("resources: {}", resourceList);
+
+    for (Resource resource : resourceList) {
+      String filename = resource.getFilename();
+      if (filename.endsWith(migrationConfig.getApplySuffix())) {
+        int pos = filename.lastIndexOf(migrationConfig.getApplySuffix());
+        String mainName = filename.substring(0, pos);
+
+        MigrationVersion migrationVersion = MigrationVersion.parse(mainName);
+        LocalMigrationResource res = new LocalMigrationResource(migrationVersion, resource.getLocation(), resource);
+        versions.add(res);
+      }
+    }
+
+    Collections.sort(versions);
+    return !versions.isEmpty();
+  }
+
+  /**
+   * Return the list of migration resources in version order.
+   */
+  public List<LocalMigrationResource> getVersions() {
+    return versions;
+  }
+
+
+  /**
+   * Filter used to find the migration scripts.
+   */
+  private static class Match implements ResourceFilter {
+
+    private final DbMigrationConfig migrationConfig;
+
+    Match(DbMigrationConfig migrationConfig) {
+      this.migrationConfig = migrationConfig;
+    }
+
+    @Override
+    public boolean isMatch(String name) {
+      return name.endsWith(migrationConfig.getApplySuffix());
+    }
+  }
+}

src/main/java/com/avaje/ebean/dbmigration/runner/MigrationMetaRow.java

@@ -0,0 +1,105 @@
+package com.avaje.ebean.dbmigration.runner;
+
+import com.avaje.ebean.SqlRow;
+import com.avaje.ebean.SqlUpdate;
+
+import java.sql.Timestamp;
+
+/**
+ * Bean holding migration execution details stored in the migration table.
+ */
+class MigrationMetaRow {
+
+  private int id;
+
+  private String type;
+
+  private String version;
+
+  private String comment;
+
+  private int checksum;
+
+  private Timestamp runOn;
+
+  private String runBy;
+
+  private long runTime;
+
+  /**
+   * Construct for inserting into table.
+   */
+  MigrationMetaRow(int id, String type, String version, String comment, int checksum, String runBy, Timestamp runOn, long runTime) {
+    this.id = id;
+    this.type = type;
+    this.version = version;
+    this.checksum = checksum;
+    this.comment = comment;
+    this.runBy = runBy;
+    this.runOn = runOn;
+    this.runTime = runTime;
+  }
+
+  /**
+   * Construct from the SqlRow (read from table).
+   */
+  MigrationMetaRow(SqlRow row) {
+    id = row.getInteger("id");
+    type = row.getString("mtype");
+    version = row.getString("mversion");
+    comment = row.getString("mcomment");
+    checksum = row.getInteger("mchecksum");
+    runBy = row.getString("run_by");
+    runTime = row.getLong("run_time");
+  }
+
+  public String toString() {
+    return "id:" + id + " type:" + type + " runVersion:" + version + " comment:" + comment + " runOn:" + runOn + " runBy:" + runBy;
+  }
+
+  /**
+   * Return the id for this migration.
+   */
+  int getId() {
+    return id;
+  }
+
+  /**
+   * Return the normalised version for this migration.
+   */
+  String getVersion() {
+    return version;
+  }
+
+  /**
+   * Return the checksum for this migration.
+   */
+  int getChecksum() {
+    return checksum;
+  }
+
+  /**
+   * Bind to the insert statement.
+   */
+  void bindInsert(SqlUpdate insert) {
+    insert.setParameter(1, id);
+    insert.setParameter(2, type);
+    insert.setParameter(3, "SUCCESS");
+    insert.setParameter(4, version);
+    insert.setParameter(5, comment);
+    insert.setParameter(6, checksum);
+    insert.setParameter(7, runOn);
+    insert.setParameter(8, runBy);
+    insert.setParameter(9, runTime);
+  }
+
+  /**
+   * Return the SQL insert given the table migration meta data is stored in.
+   */
+  static String insertSql(String table) {
+    return "insert into " + table
+        + " (id, mtype, mstatus, mversion, mcomment, mchecksum, run_on, run_by, run_time)"
+        + " values (?,?,?,?,?,?,?,?,?)";
+  }
+
+}

src/main/java/com/avaje/ebean/dbmigration/runner/MigrationScriptRunner.java

@@ -0,0 +1,30 @@
+package com.avaje.ebean.dbmigration.runner;
+
+import com.avaje.ebean.dbmigration.DdlRunner;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * Runs the DDL migration scripts.
+ */
+public class MigrationScriptRunner {
+
+  private final Connection connection;
+
+  /**
+   * Construct with a given connection.
+   */
+  public MigrationScriptRunner(Connection connection) {
+    this.connection = connection;
+  }
+
+  /**
+   * Execute all the DDL statements in the script.
+   */
+  int runScript(boolean expectErrors, String content, String scriptName) throws SQLException {
+
+    DdlRunner runner = new DdlRunner(expectErrors, scriptName);
+    return runner.runAll(content, connection);
+  }
+}

src/main/java/com/avaje/ebean/dbmigration/runner/MigrationTable.java

@@ -0,0 +1,263 @@
+package com.avaje.ebean.dbmigration.runner;
+
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.SqlQuery;
+import com.avaje.ebean.SqlRow;
+import com.avaje.ebean.SqlUpdate;
+import com.avaje.ebean.config.DbMigrationConfig;
+import com.avaje.ebean.config.ServerConfig;
+import com.avaje.ebean.config.dbplatform.DatabasePlatform;
+import com.avaje.ebean.dbmigration.MigrationRunner;
+import com.avaje.ebean.plugin.SpiServer;
+import com.avaje.ebeaninternal.server.transaction.ExternalJdbcTransaction;
+import com.avaje.ebeaninternal.util.IOUtils;
+import org.slf4j.Logger;
+
+import java.io.IOException;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Manages the migration table.
+ */
+public class MigrationTable {
+
+  private static final Logger logger = MigrationRunner.logger;
+
+  private final Connection connection;
+
+  private final EbeanServer server;
+
+  private final DatabasePlatform databasePlatform;
+
+  private final String catalog;
+  private final String schema;
+  private final String table;
+  private final ServerConfig serverConfig;
+  private final String envUserName;
+
+  private final Timestamp runOn = new Timestamp(System.currentTimeMillis());
+
+  private final ScriptTransform scriptTransform;
+
+  private final String insertSql;
+
+  private final LinkedHashMap<String, MigrationMetaRow> migrations;
+
+  private MigrationMetaRow lastMigration;
+
+  /**
+   * Construct with server, configuration and jdbc connection (DB admin user).
+   */
+  public MigrationTable(EbeanServer server, DbMigrationConfig migrationConfig, Connection connection) {
+    this.connection = connection;
+    this.server = server;
+    this.migrations = new LinkedHashMap<String, MigrationMetaRow>();
+
+    SpiServer pluginApi = server.getPluginApi();
+    this.serverConfig = pluginApi.getServerConfig();
+    this.databasePlatform = pluginApi.getDatabasePlatform();
+    this.catalog = null;
+    this.schema = null;
+    this.table = migrationConfig.getMetaTable();
+    this.insertSql = MigrationMetaRow.insertSql(table);
+    this.scriptTransform = createScriptTransform(migrationConfig);
+    this.envUserName = System.getProperty("user.name");
+  }
+
+  /**
+   * Return the number of migrations in the DB migration table.
+   */
+  public int size() {
+    return migrations.size();
+  }
+
+  /**
+   * Create the ScriptTransform for placeholder key/value replacement.
+   */
+  private ScriptTransform createScriptTransform(DbMigrationConfig config) {
+
+    Map<String, String> map = PlaceholderBuilder.build(config.getRunPlaceholders(), config.getRunPlaceholderMap());
+    return new ScriptTransform(map);
+  }
+
+  /**
+   * Create the table is it does not exist.
+   */
+  public void createIfNeeded() throws SQLException, IOException {
+
+    if (!tableExists(connection)) {
+      createTable(connection);
+    }
+
+    ExternalJdbcTransaction t = new ExternalJdbcTransaction(connection);
+    SqlQuery sqlQuery = server.createSqlQuery("select * from " + table + " order by id for update");
+    List<SqlRow> metaRows = server.findList(sqlQuery, t);
+
+    for (SqlRow row : metaRows) {
+      MigrationMetaRow metaRow = new MigrationMetaRow(row);
+      addMigration(metaRow.getVersion(), metaRow);
+    }
+  }
+
+
+  private void createTable(Connection connection) throws IOException, SQLException {
+
+    String script = ScriptTransform.table(table, getCreateTableScript());
+
+    MigrationScriptRunner run = new MigrationScriptRunner(connection);
+    run.runScript(false, script, "create migration table");
+  }
+
+  /**
+   * Return the create table script.
+   */
+  private String getCreateTableScript() throws IOException {
+    // supply a script to override the default table create script
+    String script = readResource("migration-support/create-table.sql");
+    if (script == null) {
+      // no, just use the default script
+      script = readResource("migration-support/default-create-table.sql");
+    }
+    return script;
+  }
+
+  private String readResource(String location) throws IOException {
+
+    Enumeration<URL> resources = serverConfig.getClassLoadConfig().getResources(location);
+    if (resources.hasMoreElements()) {
+      URL url = resources.nextElement();
+      return IOUtils.readUtf8(url.openStream());
+    }
+    return null;
+  }
+
+  /**
+   * Return true if the table exists.
+   */
+  private boolean tableExists(Connection connection) throws SQLException {
+    boolean exists = databasePlatform.tableExists(connection, catalog, schema, table);
+    if (!exists) {
+      exists = databasePlatform.tableExists(connection, catalog, schema, table.toUpperCase());
+    }
+    return exists;
+  }
+
+  /**
+   * Return true if the migration ran successfully and false if the migration failed.
+   */
+  public boolean shouldRun(LocalMigrationResource localVersion, LocalMigrationResource priorVersion) throws SQLException {
+
+    if (priorVersion != null && !localVersion.isRepeatable()) {
+      if (!migrationExists(priorVersion)) {
+        logger.error("Migration {} requires prior migration {} which has not been run", localVersion.getVersion(), priorVersion.getVersion());
+        return false;
+      }
+    }
+
+    MigrationMetaRow existing = migrations.get(localVersion.key());
+    return runMigration(localVersion, existing);
+  }
+
+  /**
+   * Run the migration script.
+   *
+   * @param local    The local migration resource
+   * @param existing The information for this migration existing in the table
+   *
+   * @return True if the migrations should continue
+   */
+  private boolean runMigration(LocalMigrationResource local, MigrationMetaRow existing) throws SQLException {
+
+    String script = convertScript(local.getContent());
+    int checksum = Checksum.calculate(script);
+
+    if (existing != null) {
+
+      boolean matchChecksum = (existing.getChecksum() == checksum);
+
+      if (!local.isRepeatable()) {
+        if (!matchChecksum) {
+          logger.error("Checksum mismatch on migration {}", local.getLocation());
+        }
+        return true;
+
+      } else if (matchChecksum) {
+        logger.trace("... skip unchanged repeatable migration {}", local.getLocation());
+        return true;
+      }
+    }
+
+    runMigration(local, script, checksum);
+    return true;
+  }
+
+  /**
+   * Run a migration script as new migration or update on existing repeatable migration.
+   */
+  private void runMigration(LocalMigrationResource local, String script, int checksum) throws SQLException {
+
+    logger.debug("run migration {}", local.getLocation());
+
+    long start = System.currentTimeMillis();
+    MigrationScriptRunner run = new MigrationScriptRunner(connection);
+    run.runScript(false, script, "run migration version: " + local.getVersion());
+
+    long exeMillis = System.currentTimeMillis() - start;
+    // insert new migration row
+    SqlUpdate insert = server.createSqlUpdate(insertSql);
+    MigrationMetaRow metaRow = createMetaRow(local, checksum, exeMillis);
+    metaRow.bindInsert(insert);
+    server.execute(insert, new ExternalJdbcTransaction(connection));
+
+    addMigration(local.key(), metaRow);
+  }
+
+  /**
+   * Create the MigrationMetaRow for this migration.
+   */
+  private MigrationMetaRow createMetaRow(LocalMigrationResource migration, int checksum, long exeMillis) {
+
+    int nextId = 1;
+    if (lastMigration != null) {
+      nextId = lastMigration.getId() + 1;
+    }
+
+    String type = migration.getType();
+    String runVersion = migration.key();
+    String comment = migration.getComment();
+
+    return new MigrationMetaRow(nextId, type, runVersion, comment, checksum, envUserName, runOn, exeMillis);
+  }
+
+  /**
+   * Return true if the migration exists.
+   */
+  private boolean migrationExists(LocalMigrationResource priorVersion) {
+    return migrations.containsKey(priorVersion.key());
+  }
+
+  /**
+   * Apply the placeholder key/value replacement on the script.
+   */
+  private String convertScript(String script) {
+    return scriptTransform.transform(script);
+  }
+
+  /**
+   * Register the successfully executed migration (to allow dependant scripts to run).
+   */
+  private void addMigration(String key, MigrationMetaRow metaRow) {
+    lastMigration = metaRow;
+    if (metaRow.getVersion() == null) {
+      throw new IllegalStateException("No runVersion in db migration table row? " + metaRow);
+    }
+    migrations.put(key, metaRow);
+  }
+}

src/main/java/com/avaje/ebean/dbmigration/runner/PlaceholderBuilder.java

@@ -0,0 +1,53 @@
+package com.avaje.ebean.dbmigration.runner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Joins placeholder map and comma/equals delimited string.
+ */
+class PlaceholderBuilder {
+
+  private final Map<String,String> map = new HashMap<String,String>();
+
+  /**
+   * Create with raw comma and equals delimited pairs plus map of key value pairs.
+   */
+  public static Map<String,String> build(String commaDelimited, Map<String,String> placeholders) {
+
+    PlaceholderBuilder builder = new PlaceholderBuilder();
+    builder.add(commaDelimited);
+    builder.add(placeholders);
+
+    return builder.map;
+  }
+
+  private PlaceholderBuilder() {
+
+  }
+
+  /**
+   * Add a comma and equals delimited string to parse for key value pairs.
+   */
+  public void add(String commaDelimited) {
+
+    if (commaDelimited != null) {
+      String[] split = commaDelimited.split("[,;]");
+      for (String keyValue : split) {
+        String[] pair = keyValue.split("=");
+        if (pair.length == 2) {
+          map.put(pair[0].trim(), pair[1].trim());
+        }
+      }
+    }
+  }
+
+  /**
+   * Add a map of key value placeholder pairs.
+   */
+  public void add(Map<String,String> placeholders) {
+    if (placeholders != null) {
+      map.putAll(placeholders);
+    }
+  }
+}

src/main/java/com/avaje/ebean/dbmigration/runner/ScriptTransform.java

@@ -0,0 +1,47 @@
+package com.avaje.ebean.dbmigration.runner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Transforms a SQL script given a map of key/value substitutions.
+ */
+class ScriptTransform {
+
+  /**
+   * Transform just ${table} with the table name.
+   */
+  public static String table(String tableName, String script) {
+    return script.replace("${table}", tableName);
+  }
+
+  private final Map<String,String> placeholders = new HashMap<String, String>();
+
+  ScriptTransform(Map<String,String> map) {
+    for (Map.Entry<String, String> entry : map.entrySet()) {
+      placeholders.put(wrapKey(entry.getKey()), entry.getValue());
+    }
+  }
+
+  private String wrapKey(String key) {
+    return "${"+key+"}";
+  }
+
+  /**
+   * Return true if this contains no placeholders.
+   */
+  boolean isEmpty() {
+    return placeholders.isEmpty();
+  }
+
+  /**
+   * Transform the script replacing placeholders in the form <code>${key}</code> with <code>value</code>.
+   */
+  String transform(String source) {
+
+    for (Map.Entry<String, String> entry : placeholders.entrySet()) {
+      source = source.replace(entry.getKey(), entry.getValue());
+    }
+    return source;
+  }
+}

src/main/java/com/avaje/ebean/event/AbstractBeanPersistListener.java

@@ -46,33 +46,4 @@ public abstract class AbstractBeanPersistListener implements BeanPersistListener
     return false;
   }
 
-  /**
-   * Notify that a bean was inserted on another node of the cluster.
-   *
-   * @param id the id value of the inserted bean
-   */
-  @Override
-  public void remoteInsert(Object id) {
-    // do nothing
-  }
-
-  /**
-   * Notify that a bean was updated on another node of the cluster.
-   *
-   * @param id the id value of the updated bean.
-   */
-  @Override
-  public void remoteUpdate(Object id) {
-    // do nothing
-  }
-
-  /**
-   * Notify that a bean was deleted on another node of the cluster.
-   *
-   * @param id the id value of the deleted bean.
-   */
-  @Override
-  public void remoteDelete(Object id) {
-    // do nothing
-  }
 }

src/main/java/com/avaje/ebean/event/BeanPersistListener.java

@@ -74,28 +74,4 @@ public interface BeanPersistListener {
    */
   boolean deleted(Object bean);
 
-  /**
-   * Notify that a bean was inserted on another node of the cluster.
-   * 
-   * @param id
-   *          the id value of the inserted bean
-   */
-  void remoteInsert(Object id);
-
-  /**
-   * Notify that a bean was updated on another node of the cluster.
-   * 
-   * @param id
-   *          the id value of the updated bean.
-   */
-  void remoteUpdate(Object id);
-
-  /**
-   * Notify that a bean was deleted on another node of the cluster.
-   * 
-   * @param id
-   *          the id value of the deleted bean.
-   */
-  void remoteDelete(Object id);
-
 }

src/main/java/com/avaje/ebean/event/readaudit/ReadAuditQueryPlan.java

@@ -74,4 +74,23 @@ public class ReadAuditQueryPlan {
   public void setSql(String sql) {
     this.sql = sql;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    ReadAuditQueryPlan that = (ReadAuditQueryPlan) o;
+    if (!beanType.equals(that.beanType)) return false;
+    if (!queryKey.equals(that.queryKey)) return false;
+    return sql.equals(that.sql);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = beanType.hashCode();
+    result = 31 * result + queryKey.hashCode();
+    result = 31 * result + sql.hashCode();
+    return result;
+  }
 }

src/main/java/com/avaje/ebean/plugin/SpiServer.java

@@ -4,6 +4,7 @@ import com.avaje.ebean.EbeanServer;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
 
+import javax.sql.DataSource;
 import java.util.List;
 
 /**
@@ -40,4 +41,10 @@ public interface SpiServer extends EbeanServer {
    * Return the bean type for a given doc store queueId.
    */
   BeanType<?> getBeanTypeForQueueId(String queueId);
+
+  /**
+   * Return the associated DataSource for this EbeanServer instance.
+   */
+  DataSource getDataSource();
+
 }

src/main/java/com/avaje/ebean/text/json/EJson.java

@@ -6,7 +6,9 @@ import java.io.Writer;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
+import com.avaje.ebeaninternal.server.type.ModifyAwareList;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
@@ -90,9 +92,15 @@ public class EJson {
     return EJsonReader.parseObject(parser, token);
   }
 
+  /**
+   * Parse the json and return as a modify aware List.
+   */
+  public static List<Object> parseList(String json, boolean modifyAware) throws IOException {
+    return EJsonReader.parseList(json, modifyAware);
+  }
+
   /**
    * Parse the json and return as a List.
-   * @throws IOException 
    */
   public static List<Object> parseList(String json) throws IOException {
     return EJsonReader.parseList(json);
@@ -100,7 +108,6 @@ public class EJson {
   
   /**
    * Parse the json and return as a List taking a Reader.
-   * @throws IOException 
    */
   public static List<Object> parseList(Reader reader) throws IOException {
     return EJsonReader.parseList(reader);
@@ -110,10 +117,16 @@ public class EJson {
    * Parse the json and return as a List taking a JsonParser.
    */
   public static List<Object> parseList(JsonParser parser) throws IOException {
-    return EJsonReader.parseList(parser);
+    return EJsonReader.parseList(parser, false);
   }
-  
-  
+
+  /**
+   * Parse the json returning as a List taking into account the current token.
+   */
+  public static List<Object> parseList(JsonParser parser, JsonToken currentToken) throws IOException {
+    return (List<Object>)EJsonReader.parse(parser, currentToken, false);
+  }
+
   /**
    * Parse the json and return as a List or Map.
    */
@@ -135,4 +148,14 @@ public class EJson {
     return EJsonReader.parse(parser);
   }
 
+  /**
+   * Parse the json returning a Set that might be modify aware.
+   */
+  public static Set parseSet(String json, boolean modifyAware) throws IOException {
+    List<Object> list = parseList(json, modifyAware);
+    if (list == null) {
+      return null;
+    }
+    return ((ModifyAwareList)list).asSet();
+  }
 }

src/main/java/com/avaje/ebean/text/json/EJsonReader.java

@@ -51,6 +51,11 @@ class EJsonReader {
     return (Map<String, Object>)parse(parser, token, false);
   }
 
+  @SuppressWarnings("unchecked")
+  static List<Object> parseList(String json, boolean modifyAware) throws IOException {
+    return (List<Object>) parse(json, modifyAware);
+  }
+
   @SuppressWarnings("unchecked")
   static List<Object> parseList(String json) throws IOException {
     return (List<Object>) parse(json);
@@ -62,15 +67,21 @@ class EJsonReader {
   }
   
   @SuppressWarnings("unchecked")
-  static List<Object> parseList(JsonParser parser) throws IOException {
-    return (List<Object>) parse(parser);
+  static List<Object> parseList(JsonParser parser, boolean modifyAware) throws IOException {
+    return (List<Object>) parse(parser, modifyAware);
   }
 
   static Object parse(String json) throws IOException {
+    if (json == null) {
+      return null;
+    }
     return parse(new StringReader(json));
   }
 
   static Object parse(String json, boolean modifyAware) throws IOException {
+    if (json == null) {
+      return null;
+    }
     return parse(new StringReader(json), modifyAware);
   }
 

src/main/java/com/avaje/ebeaninternal/api/ClassPathSearchService.java

@@ -1,46 +0,0 @@
-package com.avaje.ebeaninternal.api;
-
-import com.avaje.ebeaninternal.server.util.ClassPathSearchFilter;
-import com.avaje.ebeaninternal.server.util.ClassPathSearchMatcher;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-/**
- * This interface allows us to have more than one ClassPathSearch
- * to scan the resources by a customized way.
- *
- * @author Kefeng Deng (deng@51any.com)
- */
-public interface ClassPathSearchService {
-
-  /**
-   * Initialize this ClassPathSearchService with given parameters
-   *
-   * @param classLoader              is current classLoader
-   * @param filter                   is filter
-   * @param matcher
-   * @param classPathReaderClassName
-   */
-  void init(ClassLoader classLoader, ClassPathSearchFilter filter, ClassPathSearchMatcher matcher, String classPathReaderClassName);
-
-  /**
-   * Searches the class path for all matching classes.
-   *
-   * @return a collection of all matching classes
-   * @throws IOException if a resource is un-reachable
-   */
-  List<Class<?>> findClasses() throws IOException;
-
-  /**
-   * Return the set of jars that contained classes that matched.
-   */
-  Set<String> getJarHits();
-
-  /**
-   * Return the set of packages that contained classes that matched.
-   */
-  Set<String> getPackageHits();
-
-}

src/main/java/com/avaje/ebeaninternal/api/ConcurrencyMode.java

@@ -1,4 +1,4 @@
-package com.avaje.ebean.annotation;
+package com.avaje.ebeaninternal.api;
 
 /**
  * Optimistic concurrency mode used for updates and deletes.

src/main/java/com/avaje/ebeaninternal/api/HashQuery.java

@@ -17,6 +17,10 @@ public class HashQuery {
     this.bindHash = bindHash;
   }
 
+  public String toString() {
+    return "HashQuery@" + Integer.toHexString(hashCode());
+  }
+
   public int hashCode() {
     int hc = 31 * planHash.hashCode();
     hc = 31 * hc + bindHash;

src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java

@@ -158,7 +158,7 @@ public class LoadBeanRequest extends LoadRequest {
       EntityBean loadedBean = (EntityBean) list.get(i);
       loadedIds.add(desc.getId(loadedBean));
       if (isLoadCache()) {
-        desc.cacheBeanPutData(loadedBean);
+        desc.cacheBeanPut(loadedBean);
       }
     }
 

src/main/java/com/avaje/ebeaninternal/api/ScopeTrans.java

@@ -1,49 +1,49 @@
 package com.avaje.ebeaninternal.api;
 
-import java.util.ArrayList;
-
 import com.avaje.ebean.TxScope;
 import com.avaje.ebean.config.PersistBatch;
 
+import java.util.ArrayList;
+
 /**
  * Used internally to handle the scoping of transactions for methods.
  */
 public class ScopeTrans implements Thread.UncaughtExceptionHandler {
 
-	private static final int OPCODE_ATHROW = 191;
+  private static final int OPCODE_ATHROW = 191;
 
-	private final SpiTransactionScopeManager scopeMgr;
+  private final SpiTransactionScopeManager scopeMgr;
 
-	/**
-	 * The suspended transaction (can be null).
-	 */
-	private final SpiTransaction suspendedTransaction;
+  /**
+   * The suspended transaction (can be null).
+   */
+  private final SpiTransaction suspendedTransaction;
 
-	/**
-	 * The transaction in scope (can be null).
-	 */
-	private final SpiTransaction transaction;
+  /**
+   * The transaction in scope (can be null).
+   */
+  private final SpiTransaction transaction;
 
-	/**
-	 * If true by default rollback on Checked exceptions.
-	 */
-	private final boolean rollbackOnChecked;
+  /**
+   * If true by default rollback on Checked exceptions.
+   */
+  private final boolean rollbackOnChecked;
 
-	/**
-	 * True if the transaction was created and hence should be committed
-	 * on finally if it hasn't already been rolled back.
-	 */
-	private final boolean created;
+  /**
+   * True if the transaction was created and hence should be committed
+   * on finally if it hasn't already been rolled back.
+   */
+  private final boolean created;
 
-	/**
-	 * Explicit set of Exceptions that DO NOT cause a rollback to occur.
-	 */
-	private final ArrayList<Class<? extends Throwable>> noRollbackFor;
+  /**
+   * Explicit set of Exceptions that DO NOT cause a rollback to occur.
+   */
+  private final ArrayList<Class<? extends Throwable>> noRollbackFor;
 
-	/**
-	 * Explicit set of Exceptions that DO cause a rollback to occur.
-	 */
-	private final ArrayList<Class<? extends Throwable>> rollbackFor;
+  /**
+   * Explicit set of Exceptions that DO cause a rollback to occur.
+   */
+  private final ArrayList<Class<? extends Throwable>> rollbackFor;
 
   private PersistBatch restoreBatch;
 
@@ -51,29 +51,32 @@ public class ScopeTrans implements Thread.UncaughtExceptionHandler {
 
   private int restoreBatchSize;
 
-  /**
-	 * Flag set when a rollback has occurred.
-	 */
-	private boolean rolledBack;
-	
-	
-	public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope,
-			SpiTransaction suspendedTransaction,  SpiTransactionScopeManager scopeMgr) {
+  private Boolean restoreBatchGeneratedKeys;
 
-		this.rollbackOnChecked = rollbackOnChecked;
-		this.created = created;
-		this.transaction = transaction;
-		this.suspendedTransaction = suspendedTransaction;
-		this.scopeMgr = scopeMgr;
-		
-		this.noRollbackFor = txScope.getNoRollbackFor();
-		this.rollbackFor = txScope.getRollbackFor();
+  /**
+   * Flag set when a rollback has occurred.
+   */
+  private boolean rolledBack;
+
+
+  public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope,
+                    SpiTransaction suspendedTransaction, SpiTransactionScopeManager scopeMgr) {
+
+    this.rollbackOnChecked = rollbackOnChecked;
+    this.created = created;
+    this.transaction = transaction;
+    this.suspendedTransaction = suspendedTransaction;
+    this.scopeMgr = scopeMgr;
+
+    this.noRollbackFor = txScope.getNoRollbackFor();
+    this.rollbackFor = txScope.getRollbackFor();
 
     if (transaction != null) {
       if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
         restoreBatch = transaction.getBatch();
         restoreBatchOnCascade = transaction.getBatchOnCascade();
         restoreBatchSize = transaction.getBatchSize();
+        restoreBatchGeneratedKeys = transaction.getBatchGetGeneratedKeys();
       }
       if (txScope.isBatchSet()) {
         transaction.setBatch(txScope.getBatch());
@@ -84,70 +87,74 @@ public class ScopeTrans implements Thread.UncaughtExceptionHandler {
       if (txScope.isBatchSizeSet()) {
         transaction.setBatchSize(txScope.getBatchSize());
       }
+      if (txScope.isSkipGeneratedKeys()) {
+        transaction.setBatchGetGeneratedKeys(false);
+      }
     }
 
-	}
+  }
 
-	/**
-	 * Return the current/active transaction.
-	 */
-	protected SpiTransaction getTransaction() {
-		return transaction;
-	}
+  /**
+   * Return the current/active transaction.
+   */
+  protected SpiTransaction getTransaction() {
+    return transaction;
+  }
 
-	/**
-	 * Called when the Thread catches any uncaught exception.
-	 * For example, an unexpected NullPointerException or Error.
-	 */
-	public void uncaughtException(Thread thread, Throwable e) {
-		
-		// rollback transaction if required
-		caughtThrowable(e);
-		
-		// reinstate suspended transaction
-		onFinally();
-	}
-	
-	/**
-	 * Returned via RETURN or expected Exception from the method.
-	 * @param returnOrThrowable the return value or Throwable
-	 * @param opCode indicates 
-	 */
-	public void onExit(Object returnOrThrowable, int opCode) {
-		
-		if (opCode == OPCODE_ATHROW){
-			// exited with a Throwable
-			caughtThrowable((Throwable)returnOrThrowable);
-		}
-		onFinally();
-	}
-	
-	
-	/**
-	 * Commit if the transaction exists and has not already been rolled back.
-	 * Also reinstate the suspended transaction if there was one.
-	 */
-	public void onFinally() {
+  /**
+   * Called when the Thread catches any uncaught exception.
+   * For example, an unexpected NullPointerException or Error.
+   */
+  public void uncaughtException(Thread thread, Throwable e) {
 
-		try {		
-			if (!rolledBack) {
-				commitTransaction();
-			}
-		} finally {
-			restoreSuspended();
-		}
-	}
+    // rollback transaction if required
+    caughtThrowable(e);
 
-	protected void restoreSuspended() {
-		if (suspendedTransaction != null){
+    // reinstate suspended transaction
+    onFinally();
+  }
+
+  /**
+   * Returned via RETURN or expected Exception from the method.
+   *
+   * @param returnOrThrowable the return value or Throwable
+   * @param opCode            indicates
+   */
+  public void onExit(Object returnOrThrowable, int opCode) {
+
+    if (opCode == OPCODE_ATHROW) {
+      // exited with a Throwable
+      caughtThrowable((Throwable) returnOrThrowable);
+    }
+    onFinally();
+  }
+
+
+  /**
+   * Commit if the transaction exists and has not already been rolled back.
+   * Also reinstate the suspended transaction if there was one.
+   */
+  public void onFinally() {
+
+    try {
+      if (!rolledBack) {
+        commitTransaction();
+      }
+    } finally {
+      restoreSuspended();
+    }
+  }
+
+  protected void restoreSuspended() {
+    if (suspendedTransaction != null) {
       // put the previously suspended transaction
       // back onto the ThreadLocal or equivalent
       scopeMgr.replace(suspendedTransaction);
     }
-	}
+  }
 
-	protected void commitTransaction() {
-		if (created) {
+  protected void commitTransaction() {
+    if (created) {
       transaction.commit();
     } else {
       if (restoreBatch != null) {
@@ -159,78 +166,81 @@ public class ScopeTrans implements Thread.UncaughtExceptionHandler {
       if (restoreBatchSize > 0) {
         transaction.setBatchSize(restoreBatchSize);
       }
+      if (restoreBatchGeneratedKeys != null) {
+        transaction.setBatchGetGeneratedKeys(restoreBatchGeneratedKeys);
+      }
     }
-	}
+  }
 
-	/**
-	 * An Error was caught and this ALWAYS causes a rollback to occur.
-	 * Returns the error and this should be thrown by the calling code.
-	 */
-	public Error caughtError(Error e) {
-		rollback(e);
-		return e;
-	}
-	
-	/**
-	 * An Exception was caught and may or may not cause a rollback to occur.
-	 * Returns the exception and this should be thrown by the calling code.
-	 */
-	public <T extends Throwable> T caughtThrowable(T e) {
-		
-		if (isRollbackThrowable(e)) {
-			rollback(e);
-		}
-		return e;
-	}
+  /**
+   * An Error was caught and this ALWAYS causes a rollback to occur.
+   * Returns the error and this should be thrown by the calling code.
+   */
+  public Error caughtError(Error e) {
+    rollback(e);
+    return e;
+  }
 
-	protected void rollback(Throwable e) {
-		if (transaction != null && transaction.isActive()) {
-			// transaction is null for NOT_SUPPORTED and sometimes SUPPORTS
-			// and Inactive (already rolled back) if nested REQUIRED
-			transaction.rollback(e);
-		}
-		rolledBack = true;
-	}
+  /**
+   * An Exception was caught and may or may not cause a rollback to occur.
+   * Returns the exception and this should be thrown by the calling code.
+   */
+  public <T extends Throwable> T caughtThrowable(T e) {
 
-	/**
-	 * Return true if this throwable should cause a rollback to occur.
-	 */
-	private boolean isRollbackThrowable(Throwable e) {
+    if (isRollbackThrowable(e)) {
+      rollback(e);
+    }
+    return e;
+  }
 
-		if (e instanceof Error){
-			return true;
-		}
-		
-		if (noRollbackFor != null){
-			for (int i = 0; i < noRollbackFor.size(); i++) {
-				if (noRollbackFor.get(i).equals(e.getClass())) {
-					
-					// explicit no rollback for this one
-					return false;
-				}
-			}
-		}
+  protected void rollback(Throwable e) {
+    if (transaction != null && transaction.isActive()) {
+      // transaction is null for NOT_SUPPORTED and sometimes SUPPORTS
+      // and Inactive (already rolled back) if nested REQUIRED
+      transaction.rollback(e);
+    }
+    rolledBack = true;
+  }
+
+  /**
+   * Return true if this throwable should cause a rollback to occur.
+   */
+  private boolean isRollbackThrowable(Throwable e) {
+
+    if (e instanceof Error) {
+      return true;
+    }
+
+    if (noRollbackFor != null) {
+      for (int i = 0; i < noRollbackFor.size(); i++) {
+        if (noRollbackFor.get(i).equals(e.getClass())) {
+
+          // explicit no rollback for this one
+          return false;
+        }
+      }
+    }
+
+    if (rollbackFor != null) {
+      for (int i = 0; i < rollbackFor.size(); i++) {
+        if (rollbackFor.get(i).equals(e.getClass())) {
+          // explicit rollback for this one
+          return true;
+        }
+      }
+    }
+
+
+    if (e instanceof RuntimeException) {
+      return true;
+
+    } else {
+      // checked exceptions...
+      // EJB defaults this to false which is not intuitive IMO
+      // Ebean makes this configurable (default to true)
+      return rollbackOnChecked;
+    }
+  }
 
-		if (rollbackFor != null){
-			for (int i = 0; i < rollbackFor.size(); i++) {
-				if (rollbackFor.get(i).equals(e.getClass())) {
-					// explicit rollback for this one
-					return true;
-				}
-			}
-		}
-		
-		
-		if (e instanceof RuntimeException) {
-			return true;
-			
-		} else {
-			// checked exceptions...
-			// EJB defaults this to false which is not intuitive IMO
-			// Ebean makes this configurable (default to true)
-			return rollbackOnChecked;
-		}
-	}
-	
 
 }

src/main/java/com/avaje/ebeaninternal/api/ScopedTransaction.java

@@ -230,6 +230,11 @@ public class ScopedTransaction implements SpiTransaction {
     transaction.setBatchGetGeneratedKeys(getGeneratedKeys);
   }
 
+  @Override
+  public Boolean getBatchGetGeneratedKeys() {
+    return transaction.getBatchGetGeneratedKeys();
+  }
+
   @Override
   public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
     transaction.setBatchFlushOnMixed(batchFlushOnMixed);