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

Added support for custom database functions that have multiple arguments

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm</artifactId>
-  <version>6.13.1</version>
+  <version>6.14.1</version>
   <packaging>jar</packaging>
 
   <name>avaje-ebeanorm</name>
@@ -152,7 +152,7 @@
     <dependency>
       <groupId>org.avaje.ebeanorm</groupId>
       <artifactId>avaje-ebeanorm-agent</artifactId>
-      <version>4.7.1</version>
+      <version>4.8.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -219,7 +219,7 @@
       <plugin>
         <groupId>org.avaje.ebeanorm</groupId>
         <artifactId>avaje-ebeanorm-mavenenhancer</artifactId>
-        <version>4.7.1</version>
+        <version>4.8.1</version>
         <executions>
           <!--   Not going to enhance Model bean -->
           <execution>

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

@@ -45,7 +45,7 @@ final class DRawSqlColumnsParser {
     String colInfo = sqlSelect.substring(start, pos++);
     colInfo = colInfo.trim();
 
-    String[] split = colInfo.split(" ");
+    String[] split = colInfo.split("\\s(?=[^\\)]*(?:\\(|$))");
     if (split.length > 1) {
       ArrayList<String> tmp = new ArrayList<String>(split.length);
       for (int i = 0; i < split.length; i++) {
@@ -82,11 +82,13 @@ final class DRawSqlColumnsParser {
 
   private void nextComma() {
     boolean inQuote = false;
+    int inbrackets = 0;
     while (pos < end) {
       char c = sqlSelect.charAt(pos);
-      if (c == '\'') {
-        inQuote = !inQuote;
-      } else if (!inQuote && c == ',') {
+      if (c == '\'') inQuote = !inQuote;
+      else if (c == '(') inbrackets++;
+      else if (c == ')') inbrackets--;
+      else if (!inQuote && inbrackets == 0 && c == ',') {
         return;
       }
       pos++;

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

@@ -46,6 +46,7 @@ class DRawSqlParser {
 
   private DRawSqlParser(String sqlString) {
     sqlString = sqlString.trim();
+    sqlString = sqlString.replace('\n',' ');
     this.sql = sqlString;
     this.hasPlaceHolders = findAndRemovePlaceHolders();
     this.textParser = new SimpleTextParser(sqlString);
@@ -120,8 +121,7 @@ class DRawSqlParser {
       // trim of distinct keyword
       String distinct = preWhereExprSql.substring(0, 9);
       if (!distinct.equalsIgnoreCase("distinct ")) {
-        throw new RuntimeException("Expecting [" + preWhereExprSql
-            + "] to start with \"select distinct\"");
+        throw new RuntimeException("Expecting [" + preWhereExprSql + "] to start with \"select distinct\"");
       }
       preWhereExprSql = preWhereExprSql.substring(9);
     }

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

@@ -9,6 +9,7 @@ import com.avaje.ebean.text.csv.CsvReader;
 import com.avaje.ebean.text.json.JsonContext;
 import org.jetbrains.annotations.Nullable;
 
+import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.util.Collection;
@@ -1019,7 +1020,7 @@ public interface EbeanServer {
   SqlFutureList findFutureList(SqlQuery query, Transaction transaction);
 
   /**
-   * Return a PagedList for this query.
+   * Return a PagedList for this query using pageIndex and pageSize.
    * <p>
    * The benefit of using this over just using the normal {@link Query#setFirstRow(int)} and
    * {@link Query#setMaxRows(int)} is that it additionally wraps an optional call to
@@ -1041,6 +1042,38 @@ public interface EbeanServer {
    */
   <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction, int pageIndex, int pageSize);
 
+  /**
+   * Return a PagedList for this query using firstRow and maxRows.
+   * <p>
+   * The benefit of using this over findList() is that it provides functionality to get the
+   * total row count etc.
+   * </p>
+   * <p>
+   * If maxRows is not set on the query prior to calling findPagedList() then a
+   * PersistenceException is thrown.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *       .setFirstRow(50)
+   *       .setMaxRows(20)
+   *       .findPagedList();
+   *
+   *       // fetch the total row count in the background
+   *       pagedList.loadRowCount();
+   *
+   *       List<Order> orders = pagedList.getList();
+   *       int totalRowCount = pagedList.getTotalRowCount();
+   *
+   * }</pre>
+   *
+   * @return The PagedList
+   *
+   * @see Query#findPagedList()
+   */
+  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);
+
   /**
    * Execute the query returning a set of entity beans.
    * <p>
@@ -1091,14 +1124,17 @@ public interface EbeanServer {
   <T> Map<?, T> findMap(Query<T> query, Transaction transaction);
 
   /**
-   * Execute the query returning at most one entity bean. This will throw a
-   * PersistenceException if the query finds more than one result.
+   * Execute the query returning at most one entity bean or null (if no matching
+   * bean is found).
+   * <p>
+   * This will throw a NonUniqueResultException if the query finds more than one result.
+   * </p>
    * <p>
    * Generally you are able to use {@link Query#findUnique()} rather than
    * explicitly calling this method. You could use this method if you wish to
    * explicitly control the transaction used for the query.
    * </p>
-   * 
+   *
    * @param <T>
    *          the type of entity bean to fetch.
    * @param query
@@ -1106,6 +1142,7 @@ public interface EbeanServer {
    * @param transaction
    *          the transaction to use (can be null).
    * @return the list of fetched beans.
+   * @throws NonUniqueResultException if more than one result was found
    *
    * @see Query#findUnique()
    */

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

@@ -3,6 +3,7 @@ package com.avaje.ebean;
 import com.avaje.ebean.text.PathProperties;
 import org.jetbrains.annotations.Nullable;
 
+import javax.persistence.NonUniqueResultException;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Collection;
@@ -193,8 +194,15 @@ public interface ExpressionList<T> extends Serializable {
   <K> Map<K, T> findMap(String keyProperty, Class<K> keyType);
 
   /**
-   * Execute the query returning a single bean.
-   * 
+   * Execute the query returning a single bean or null (if no matching
+   * bean is found).
+   * <p>
+   * If more than 1 row is found for this query then a NonUniqueResultException is
+   * thrown.
+   * </p>
+   *
+   * @throws NonUniqueResultException if more than one result was found
+   *
    * @see Query#findUnique()
    */
   @Nullable
@@ -237,7 +245,7 @@ public interface ExpressionList<T> extends Serializable {
   FutureList<T> findFutureList();
 
   /**
-   * Return a PagedList for this query.
+   * Return a PagedList for this query using pageIndex and pageSize.
    * <p>
    * The benefit of using this over just using the normal {@link Query#setFirstRow(int)} and
    * {@link Query#setMaxRows(int)} is that it additionally wraps an optional call to
@@ -257,6 +265,38 @@ public interface ExpressionList<T> extends Serializable {
    */
   PagedList<T> findPagedList(int pageIndex, int pageSize);
 
+  /**
+   * Return a PagedList for this query using firstRow and maxRows.
+   * <p>
+   * The benefit of using this over findList() is that it provides functionality to get the
+   * total row count etc.
+   * </p>
+   * <p>
+   * If maxRows is not set on the query prior to calling findPagedList() then a
+   * PersistenceException is thrown.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *       .setFirstRow(50)
+   *       .setMaxRows(20)
+   *       .findPagedList();
+   *
+   *       // fetch the total row count in the background
+   *       pagedList.loadRowCount();
+   *
+   *       List<Order> orders = pagedList.getList();
+   *       int totalRowCount = pagedList.getTotalRowCount();
+   *
+   * }</pre>
+   *
+   * @return The PagedList
+   *
+   * @see Query#findPagedList()
+   */
+  PagedList<T> findPagedList();
+
   /**
    * Return versions of a @History entity bean.
    * <p>
@@ -745,7 +785,7 @@ public interface ExpressionList<T> extends Serializable {
    * qualified) will still be translated to their physical name.
    * </p>
    */
-  ExpressionList<T> raw(String raw, Object[] values);
+  ExpressionList<T> raw(String raw, Object... values);
 
   /**
    * Add raw expression with no parameters.

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

@@ -17,6 +17,33 @@ import java.util.concurrent.Future;
  * limit the result set.
  * </p>
  *
+ *
+ * <h4>Example: typical use including total row count</h4>
+ * <pre>{@code
+ *
+ *     // We want to find the first 50 new orders
+ *     //  ... so we don't really need setFirstRow(0)
+ *
+ *     PagedList<Order> pagedList
+ *       = ebeanServer.find(Order.class)
+ *       .where().eq("status", Order.Status.NEW)
+ *       .order().asc("id")
+ *       .setFirstRow(0)
+ *       .setMaxRows(50)
+ *       .findPagedList();
+ *
+ *     // Optional: initiate the loading of the total
+ *     // row count in a background thread
+ *     pagedList.loadRowCount();
+ *
+ *     // fetch and return the list in the foreground thread
+ *     List<Order> orders = pagedList.getList();
+ *
+ *     // get the total row count (from the future)
+ *     int totalRowCount = pagedList.getTotalRowCount();
+ *
+ * }</pre>
+ *
  * <h4>Example: typical use including total row count</h4>
  * <pre>{@code
  *
@@ -156,11 +183,15 @@ public interface PagedList<T> {
 
   /**
    * Return the index position of this page. Zero based.
+   * <p>
+   * Note that if firstRows/maxRows is used rather than pageIndex/pageSize then
+   * this always returns 0.
+   * </p>
    */
   int getPageIndex();
 
   /**
-   * Return the page size used for this query.
+   * Return the page size used for this query. This is the same value as maxRows used by the query.
    */
   int getPageSize();
 

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

@@ -3,6 +3,7 @@ package com.avaje.ebean;
 import com.avaje.ebean.text.PathProperties;
 import org.jetbrains.annotations.Nullable;
 
+import javax.persistence.NonUniqueResultException;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.List;
@@ -700,7 +701,7 @@ public interface Query<T> extends Serializable {
    * Execute the query returning either a single bean or null (if no matching
    * bean is found).
    * <p>
-   * If more than 1 row is found for this query then a PersistenceException is
+   * If more than 1 row is found for this query then a NonUniqueResultException is
    * thrown.
    * </p>
    * <p>
@@ -736,6 +737,8 @@ public interface Query<T> extends Serializable {
    * List<OrderDetail> details = order.getDetails();
    * ...
    * }</pre>
+   *
+   * @throws NonUniqueResultException if more than one result was found
    */
   @Nullable
   T findUnique();
@@ -819,7 +822,7 @@ public interface Query<T> extends Serializable {
   FutureList<T> findFutureList();
 
   /**
-   * Return a PagedList for this query.
+   * Return a PagedList for this query using pageIndex and pageSize.
    * <p>
    * The benefit of using this over just using the normal {@link Query#setFirstRow(int)} and
    * {@link Query#setMaxRows(int)} is that it additionally wraps an optional call to
@@ -864,6 +867,36 @@ public interface Query<T> extends Serializable {
    */
   PagedList<T> findPagedList(int pageIndex, int pageSize);
 
+  /**
+   * Return a PagedList for this query using firstRow and maxRows.
+   * <p>
+   * The benefit of using this over findList() is that it provides functionality to get the
+   * total row count etc.
+   * </p>
+   * <p>
+   * If maxRows is not set on the query prior to calling findPagedList() then a
+   * PersistenceException is thrown.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *       .setFirstRow(50)
+   *       .setMaxRows(20)
+   *       .findPagedList();
+   *
+   *       // fetch the total row count in the background
+   *       pagedList.loadRowCount();
+   *
+   *       List<Order> orders = pagedList.getList();
+   *       int totalRowCount = pagedList.getTotalRowCount();
+   *
+   * }</pre>
+   *
+   * @return The PagedList
+   */
+  PagedList<T> findPagedList();
+
   /**
    * Set a named bind parameter. Named parameters have a colon to prefix the name.
    * 

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

@@ -0,0 +1,19 @@
+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;
+
+/**
+ * A database table or column comment.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE})
+public @interface DbComment {
+
+  /**
+   * The database table or column comment.
+   */
+  String value();
+}

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

@@ -0,0 +1,19 @@
+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;
+
+/**
+ * Marks a boolean property on a @Draftable bean that indicates if the bean instance is a 'draft' or 'live' bean.
+ * The property is transient and has no underlying DB column.
+ * <p>
+ * For beans returned from an <code>asDraft()</code> query this property will be set to true.
+ * </p>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Draft {
+
+}

src/main/java/com/avaje/ebean/bean/EntityBean.java

@@ -73,16 +73,6 @@ public interface EntityBean extends Serializable {
    */
   EntityBeanIntercept _ebean_intercept();
 
-  /**
-   * Create a copy of this entity bean.
-   * <p>
-   * This occurs when a bean is changed. The copy represents the bean as it was
-   * initially (oldValues) before any changes where made. This is used for
-   * optimistic concurrency control.
-   * </p>
-   */
-  Object _ebean_createCopy();
-
   /**
    * Set the value of a field of an entity bean of this type.
    * <p>

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

@@ -0,0 +1,143 @@
+package com.avaje.ebean.config;
+
+
+/**
+ * Helper to find classes taking into account the context class loader.
+ */
+public class ClassLoadConfig {
+
+  protected final ClassLoaderContext context;
+
+  /**
+   * Construct with the default classLoader search with context classLoader first.
+   */
+  public ClassLoadConfig() {
+    this(null);
+  }
+
+  /**
+   * Specify the classLoader to use for class detection and new instance creation.
+   */
+  public ClassLoadConfig(ClassLoader classLoader) {
+    this.context = new ClassLoaderContext(classLoader);
+  }
+
+  /**
+   * Return true if the Java.time types are available and should be supported.
+   */
+  public boolean isJavaTimePresent() {
+    return isPresent("java.time.LocalDate");
+  }
+
+  /**
+   * Return true if the Joda types are available and should be supported.
+   */
+  public boolean isJodaTimePresent() {
+    return isPresent("org.joda.time.LocalDateTime");
+  }
+
+  /**
+   * Return true if javax validation annotations like Size and NotNull are present.
+   */
+  public boolean isJavaxValidationAnnotationsPresent() {
+    return isPresent("javax.validation.constraints.NotNull");
+  }
+
+  /**
+   * Return true if Jackson annotations like JsonIgnore are present.
+   */
+  public boolean isJacksonAnnotationsPresent() {
+    return isPresent("com.fasterxml.jackson.annotation.JsonIgnore");
+  }
+
+  /**
+   * Return true if Jackson ObjectMapper is present.
+   */
+  public boolean isJacksonObjectMapperPresent() {
+    return isPresent("com.fasterxml.jackson.databind.ObjectMapper");
+  }
+
+  /**
+   * Return a new instance of the class using the default constructor.
+   */
+  public Object newInstance(String className) {
+
+    try {
+      Class<?> cls = forName(className);
+      return cls.newInstance();
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Error constructing " + className, e);
+    }
+  }
+
+  /**
+   * Return true if the given class is present.
+   */
+  protected boolean isPresent(String className) {
+    try {
+      forName(className);
+      return true;
+    } catch (Throwable ex) {
+      // Class or one of its dependencies is not present...
+      return false;
+    }
+  }
+
+  /**
+   * Load a class taking into account a context class loader (if present).
+   */
+  protected Class<?> forName(String name) throws ClassNotFoundException {
+    return context.forName(name);
+  }
+
+  /**
+   * Wraps the preferred, caller and context class loaders.
+   */
+  protected class ClassLoaderContext {
+
+    /**
+     * Optional - if set only use this classLoader (no fallback).
+     */
+    protected final ClassLoader preferredLoader;
+
+    protected final ClassLoader contextLoader;
+
+    protected final ClassLoader callerLoader;
+
+    ClassLoaderContext(ClassLoader preferredLoader) {
+      this.preferredLoader = preferredLoader;
+      this.callerLoader = ServerConfig.class.getClassLoader();
+      this.contextLoader = contextLoader();
+    }
+
+    ClassLoader contextLoader() {
+      ClassLoader loader = Thread.currentThread().getContextClassLoader();
+      return (loader != null) ? loader: callerLoader;
+    }
+
+    Class<?> forName(String name) throws ClassNotFoundException {
+
+      if (preferredLoader != null) {
+        // only use the explicitly set classLoader
+        return classForName(name, preferredLoader);
+      }
+      try {
+        // try the context loader first
+        return classForName(name, contextLoader);
+      } catch (ClassNotFoundException e) {
+        if (callerLoader == contextLoader) {
+          throw e;
+        } else {
+          // fallback to the caller classLoader
+          return classForName(name, callerLoader);
+        }
+      }
+    }
+
+    Class<?> classForName(String name, ClassLoader classLoader) throws ClassNotFoundException {
+      return Class.forName(name, true, classLoader);
+    }
+
+  }
+}
+

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

@@ -1,39 +1,393 @@
 package com.avaje.ebean.config;
 
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.config.dbplatform.DbPlatformName;
+import com.avaje.ebean.dbmigration.DbMigration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Configuration for the DB migration processing.
  */
 public class DbMigrationConfig {
 
+  protected static final Logger logger = LoggerFactory.getLogger(DbMigrationConfig.class);
+
+  /**
+   * The database platform to generate migration DDL for.
+   */
+  protected DbPlatformName platform;
+
+  /**
+   * Set to true if the DB migration should be generated on server start.
+   */
+  protected boolean generate;
+
+  /**
+   * Set to true to suppress the output of the rollback script.
+   */
+  protected boolean suppressRollback;
+
+  /**
+   * The migration version name (typically FlywayDb compatible).
+   * <p>
+   * Example: 1.1.1_2
+   * <p>
+   * The version is expected to be the combination of the current pom version plus
+   * a 'feature' id. The combined version must be unique and ordered to work with
+   * FlywayDb so each developer sets a unique version so that the migration script
+   * generated is unique (typically just prior to being submitted as a merge request).
+   */
+  protected String version;
+
+  /**
+   * Description text that can be appended to the version to become the ddl script file name.
+   * <p>
+   * So if the name is "a foo table" then the ddl script file could be:
+   * "1.1.1_2__a-foo-table.sql"
+   * <p>
+   * When the DB migration relates to a git feature (merge request) then this description text
+   * is a short description of the feature.
+   */
+  protected String name;
+
   /**
    * Resource path for the migration xml and sql.
-   * Typically you would change 'app' to be a better/more unique.
    */
-  private String resourcePath = "dbmigration/app";
+  protected String migrationPath = "dbmigration";
+
+  /**
+   * Subdirectory the model xml files go into.
+   */
+  protected String modelPath = "model";
+
+  /**
+   * Subdirectory the drop ddl scripts go into.
+   */
+  protected String dropPath = "drop";
+
+  /**
+   * Subdirectory the rollback ddl scripts go into.
+   */
+  protected String rollbackPath = "rollback";
+
+  /**
+   * Apply script suffix.
+   */
+  protected String applySuffix = ".sql";
+
+  /**
+   * Default drop script suffix to ddl so that it isn't picked up by FlywayDb.
+   */
+  protected String dropSuffix = ".drop.ddl";
+
+  /**
+   * Default rollback script suffix to ddl so that it isn't picked up by FlywayDb.
+   */
+  protected String rollbackSuffix = ".rollback.ddl";
+
+  protected String modelSuffix = ".model.xml";
+
+  /**
+   * Return the DB platform to generate migration DDL for.
+   *
+   * We typically need to explicitly specify this as migration can often be generated
+   * when running against H2.
+   */
+  public DbPlatformName getPlatform() {
+    return platform;
+  }
+
+  /**
+   * Set the DB platform to generate migration DDL for.
+   */
+  public void setPlatform(DbPlatformName platform) {
+    this.platform = platform;
+  }
 
   /**
    * Return the resource path for db migrations.
    */
-  public String getResourcePath() {
-    return resourcePath;
+  public String getMigrationPath() {
+    return migrationPath;
   }
 
   /**
    * Set the resource path for db migrations.
    * <p>
-   * Typically this would be something like "dbmigration/myapp" where myapp gives it a
-   * unique resource path in the case there are multiple EbeanServer applications in the
-   * single classpath.
+   * The default of "dbmigration" is reasonable in most cases. You may look to set this
+   * to be something like "dbmigration/myapp" where myapp gives it a unique resource path
+   * in the case there are multiple EbeanServer applications in the single classpath.
    * </p>
    */
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
+  public void setMigrationPath(String migrationPath) {
+    this.migrationPath = migrationPath;
+  }
+
+  /**
+   * Return the relative path for the model files (defaults to model).
+   */
+  public String getModelPath() {
+    return modelPath;
+  }
+
+  /**
+   * Set the relative path for the model files.
+   */
+  public void setModelPath(String modelPath) {
+    this.modelPath = modelPath;
+  }
+
+  /**
+   * Return the relative path for the drop ddl scripts (defaults to drop).
+   */
+  public String getDropPath() {
+    return dropPath;
+  }
+
+  /**
+   * Set the relative path for the drop ddl scripts (defaults to drop).
+   */
+  public void setDropPath(String dropPath) {
+    this.dropPath = dropPath;
+  }
+
+  /**
+   * Return the relative path for the rollback ddl scripts (defaults to rollback).
+   */
+  public String getRollbackPath() {
+    return rollbackPath;
+  }
+
+  /**
+   * Set the relative path for the rollback ddl scripts (defaults to rollback).
+   */
+  public void setRollbackPath(String rollbackPath) {
+    this.rollbackPath = rollbackPath;
+  }
+
+  /**
+   * Return the model suffix (defaults to model.xml)
+   */
+  public String getModelSuffix() {
+    return modelSuffix;
+  }
+
+  /**
+   * Set the model suffix.
+   */
+  public void setModelSuffix(String modelSuffix) {
+    this.modelSuffix = modelSuffix;
+  }
+
+  /**
+   * Return true if the rollback script should not be output.
+   */
+  public boolean isSuppressRollback() {
+    return suppressRollback;
+  }
+
+  /**
+   * Set to true to suppress the output of the rollback script.
+   */
+  public void setSuppressRollback(boolean suppressRollback) {
+    this.suppressRollback = suppressRollback;
+  }
+
+  /**
+   * Return the apply script suffix (defaults to sql).
+   */
+  public String getApplySuffix() {
+    return applySuffix;
+  }
+
+  /**
+   * Set the apply script suffix (defaults to sql).
+   */
+  public void setApplySuffix(String applySuffix) {
+    this.applySuffix = applySuffix;
+  }
+
+  /**
+   * Return the drop script suffix (defaults to ddl so that it isn't picked up by FlywayDb).
+   */
+  public String getDropSuffix() {
+    return dropSuffix;
+  }
+
+  /**
+   * Set the drop script suffix (defaults to ddl so that it isn't picked up by FlywayDb).
+   */
+  public void setDropSuffix(String dropSuffix) {
+    this.dropSuffix = dropSuffix;
+  }
+
+  /**
+   * Return the rollback script suffix (defaults to ddl so that it isn't picked up by FlywayDb).
+   */
+  public String getRollbackSuffix() {
+    return rollbackSuffix;
+  }
+
+  /**
+   * Set the rollback script suffix (defaults to ddl so that it isn't picked up by FlywayDb).
+   */
+  public void setRollbackSuffix(String rollbackSuffix) {
+    this.rollbackSuffix = rollbackSuffix;
+  }
+
+  /**
+   * Set the migration version.
+   * <p>
+   * Note that version set via System property or environment variable <code>ddl.migration.version</code> takes precedence.
+   */
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  /**
+   * Set the migration name.
+   * <p>
+   * Note that name set via System property or environment variable <code>ddl.migration.name</code> takes precedence.
+   */
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /**
+   * Set the model, rollback and drop paths to be empty such that all the migration files are generated
+   * into a single directory.
+   */
+  public void singleDirectory() {
+    this.dropPath = "";
+    this.rollbackPath = "";
+    this.modelPath = "";
   }
 
   /**
    * Load the settings from the PropertiesWrapper.
    */
   public void loadSettings(PropertiesWrapper properties) {
-    resourcePath = properties.get("migration.resourcePath", resourcePath);
+
+    migrationPath = properties.get("migration.migrationPath", migrationPath);
+    if (properties.getBoolean("migration.singleDirectory", false)) {
+      singleDirectory();
+    } else {
+      modelPath = properties.get("migration.modelPath", modelPath);
+      rollbackPath = properties.get("migration.rollbackPath", rollbackPath);
+      dropPath = properties.get("migration.dropPath", dropPath);
+    }
+    applySuffix = properties.get("migration.applySuffix", applySuffix);
+    dropSuffix = properties.get("migration.dropSuffix", dropSuffix);
+    rollbackSuffix = properties.get("migration.rollbackSuffix", rollbackSuffix);
+    modelSuffix = properties.get("migration.modelSuffix", modelSuffix);
+
+    platform = properties.getEnum(DbPlatformName.class, "migration.platform", platform);
+    suppressRollback = properties.getBoolean("migration.suppressRollback", suppressRollback);
+
+    generate = properties.getBoolean("migration.generate", generate);
+    version = properties.get("migration.version", version);
+    name = properties.get("migration.name", name);
   }
+
+  /**
+   * Return true if the migration should be generated.
+   * <p>
+   * It is expected that when an environment variable <code>ddl.migration.enabled</code>
+   * is set to <code>true</code> then the DB migration will generate the migration DDL.
+   * </p>
+   */
+  public boolean isGenerateOnStart() {
+
+    // environment properties take precedence
+    String envGenerate = readEnvironment("ddl.migration.generate");
+    if (envGenerate != null) {
+      return "true".equalsIgnoreCase(envGenerate.trim());
+    }
+    return generate;
+  }
+
+
+  /**
+   * Called by EbeanServer on start.
+   *
+   * <p>
+   * If enabled this generates the migration xml and DDL scripts.
+   * </p>
+   */
+  public void generateOnStart(EbeanServer server) {
+
+    if (isGenerateOnStart()) {
+      if (platform == null) {
+        logger.warn("No platform set for migration DDL generation");
+      } else {
+        // generate the migration xml and platform specific DDL
+        DbMigration migration = new DbMigration(server);
+        migration.setPlatform(platform);
+        try {
+          migration.generateMigration();
+        } catch (Exception e) {
+          throw new RuntimeException("Error generating DB migration", e);
+        }
+      }
+    }
+  }
+
+  /**
+   * Return the migration version (typically FlywayDb compatible).
+   * <p>
+   * Example: 1.1.1_2
+   * <p>
+   * The version is expected to be the combination of the current pom version plus
+   * a 'feature' id. The combined version must be unique and ordered to work with
+   * FlywayDb so each developer sets a unique version so that the migration script
+   * generated is unique (typically just prior to being submitted as a merge request).
+   */
+  public String getVersion() {
+    String envVersion = readEnvironment("ddl.migration.version");
+    if (!isEmpty(envVersion)) {
+      return envVersion.trim();
+    }
+    return version;
+  }
+
+  /**
+   * Return the migration name which is short description text that can be appended to
+   * the migration version to become the ddl script file name.
+   * <p>
+   * So if the name is "a foo table" then the ddl script file could be:
+   * "1.1.1_2__a-foo-table.sql"
+   * </p>
+   * <p>
+   * When the DB migration relates to a git feature (merge request) then this description text
+   * is a short description of the feature.
+   * </p>
+   */
+  public String getName() {
+    String envName = readEnvironment("ddl.migration.name");
+    if (!isEmpty(envName)) {
+      return envName.trim();
+    }
+    return name;
+  }
+
+  /**
+   * Return the system or environment property.
+   */
+  protected String readEnvironment(String key) {
+
+    String val = System.getProperty(key);
+    if (val == null) {
+      val = System.getenv(key);
+    }
+    return val;
+  }
+
+  /**
+   * Return true if the string is null or empty.
+   */
+  protected boolean isEmpty(String val) {
+    return val == null || val.trim().isEmpty();
+  }
+
 }

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

@@ -141,8 +141,8 @@ public class PropertiesWrapper {
    * Return a Enum property value.
    */
   public <T extends Enum<T>> T getEnum(Class<T> enumType, String key, T defaultValue) {
-    String level = get(key, defaultValue.name());
-    return Enum.valueOf(enumType, level.toUpperCase());
+    String level = get(key, null);
+    return (level == null) ? defaultValue : Enum.valueOf(enumType, level.toUpperCase());
   }
 
 }

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

@@ -7,14 +7,20 @@ import com.avaje.ebean.cache.ServerCacheFactory;
 import com.avaje.ebean.cache.ServerCacheManager;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
 import com.avaje.ebean.config.dbplatform.DbEncrypt;
-import com.avaje.ebean.event.*;
+import com.avaje.ebean.event.BeanFindController;
+import com.avaje.ebean.event.BeanPersistController;
+import com.avaje.ebean.event.BeanPersistListener;
+import com.avaje.ebean.event.BeanPostLoad;
+import com.avaje.ebean.event.BeanQueryAdapter;
+import com.avaje.ebean.event.BulkTableEventListener;
+import com.avaje.ebean.event.ServerConfigStartup;
+import com.avaje.ebean.event.TransactionEventListener;
 import com.avaje.ebean.event.changelog.ChangeLogListener;
 import com.avaje.ebean.event.changelog.ChangeLogPrepare;
 import com.avaje.ebean.event.changelog.ChangeLogRegister;
 import com.avaje.ebean.event.readaudit.ReadAuditLogger;
 import com.avaje.ebean.event.readaudit.ReadAuditPrepare;
 import com.avaje.ebean.meta.MetaInfoManager;
-import com.avaje.ebean.util.ClassUtil;
 import com.fasterxml.jackson.core.JsonFactory;
 
 import javax.sql.DataSource;
@@ -228,6 +234,11 @@ public class ServerConfig {
    */
   private DbMigrationConfig migrationConfig = new DbMigrationConfig();
 
+  /**
+   * The ClassLoadConfig used to detect Joda, Java8, Jackson etc and create plugin instances given a className.
+   */
+  private ClassLoadConfig classLoadConfig = new ClassLoadConfig();
+
   /**
    * Set to true if the DataSource uses autoCommit.
    * <p>
@@ -2023,6 +2034,22 @@ public class ServerConfig {
     this.persistenceContextScope = persistenceContextScope;
   }
 
+  /**
+   * Return the ClassLoadConfig which is used to detect Joda, Java8 types etc and also
+   * create new instances of plugins given a className.
+   */
+  public ClassLoadConfig getClassLoadConfig() {
+    return classLoadConfig;
+  }
+
+  /**
+   * Set the ClassLoadConfig which is used to detect Joda, Java8 types etc and also
+   * create new instances of plugins given a className.
+   */
+  public void setClassLoadConfig(ClassLoadConfig classLoadConfig) {
+    this.classLoadConfig = classLoadConfig;
+  }
+
   /**
    * Load settings from ebean.properties.
    */
@@ -2062,14 +2089,31 @@ public class ServerConfig {
     return properties;
   }
 
+  /**
+   * Return the instance to use (can be null) for the given plugin.
+   *
+   * @param properties the properties
+   * @param pluginType the type of plugin
+   * @param key        properties key
+   * @param instance   existing instance
+   */
   @SuppressWarnings("unchecked")
-  private <T> T createInstance(PropertiesWrapper p, 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;
     }
-    String classname = p.get(key, null);
-    return classname == null ? null : (T) ClassUtil.newInstance(classname);
+    String classname = properties.get(key, null);
+    return createInstance(pluginType, classname);
+  }
+
+  /**
+   * 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
+   */
+  protected <T> T createInstance(Class<T> pluginType, String classname) {
+    return classname == null ? null : (T) classLoadConfig.newInstance(classname);
   }
 
   /**

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

@@ -17,7 +17,7 @@ public class DB2SequenceIdGenerator extends SequenceIdGenerator {
    */
   public DB2SequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
     super(be, ds, seqName, batchSize);
-    this.baseSql = "select nextval for " + seqName;
+    this.baseSql = "values nextval for " + seqName;
     this.unionBaseSql = " union " + baseSql;
   }
 

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

@@ -21,8 +21,8 @@ import com.avaje.ebean.dbmigration.model.CurrentModel;
 import com.avaje.ebean.dbmigration.model.MConfiguration;
 import com.avaje.ebean.dbmigration.model.MigrationModel;
 import com.avaje.ebean.dbmigration.model.ModelContainer;
-import com.avaje.ebean.dbmigration.model.PlatformDdlWriter;
 import com.avaje.ebean.dbmigration.model.ModelDiff;
+import com.avaje.ebean.dbmigration.model.PlatformDdlWriter;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,6 +57,13 @@ public class DbMigration {
 
   protected static final Logger logger = LoggerFactory.getLogger(DbMigration.class);
 
+  private static final String initialVersion = "1.0";
+
+  /**
+   * Set to true if DbMigration run with online EbeanServer instance.
+   */
+  protected final boolean online;
+
   protected SpiEbeanServer server;
 
   protected DbMigrationConfig migrationConfig;
@@ -71,7 +78,19 @@ public class DbMigration {
 
   protected DbConstraintNaming constraintNaming;
 
+  /**
+   * Create for offline migration generation.
+   */
   public DbMigration() {
+    this.online = false;
+  }
+
+  /**
+   * Create using online EbeanServer.
+   */
+  public DbMigration(EbeanServer server) {
+    this.online = true;
+    setServer(server);
   }
 
   /**
@@ -125,7 +144,9 @@ public class DbMigration {
    */
   public void setPlatform(DatabasePlatform databasePlatform) {
     this.databasePlatform = databasePlatform;
-    DbOffline.setPlatform(databasePlatform.getName());
+    if (!online) {
+      DbOffline.setPlatform(databasePlatform.getName());
+    }
   }
 
   /**
@@ -175,16 +196,19 @@ public class DbMigration {
   public void generateMigration() throws IOException {
 
     // use this flag to stop other plugins like full DDL generation
-    DbOffline.setRunningMigration();
+    if (!online) {
+      DbOffline.setRunningMigration();
+    }
 
     setDefaults();
 
     try {
-      MigrationModel migrationModel = new MigrationModel(migrationConfig.getResourcePath());
-      ModelContainer migrated = migrationModel.read();
-      int nextMajorVersion = migrationModel.getNextMajorVersion();
 
-      logger.info("next migration version {}", nextMajorVersion);
+      File migrationDir = getMigrationDirectory();
+      File modelDir = getModelDirectory(migrationDir);
+
+      MigrationModel migrationModel = new MigrationModel(modelDir, migrationConfig.getModelSuffix());
+      ModelContainer migrated = migrationModel.read();
 
       CurrentModel currentModel = new CurrentModel(server, constraintNaming);
       ModelContainer current = currentModel.read();
@@ -200,46 +224,89 @@ public class DbMigration {
       // there were actually changes to write
       Migration dbMigration = diff.getMigration();
 
-      File writePath = getWritePath();
-      logger.info("migration writing version {} to {}", nextMajorVersion, writePath.getAbsolutePath());
-      writeMigrationXml(dbMigration, writePath, nextMajorVersion);
+      String fullVersion = getFullVersion(migrationModel);
 
-      if (databasePlatform != null) {
-        // writer needs the current model to provide table/column details for
-        // history ddl generation (triggers, history tables etc)
-        DdlWrite write = new DdlWrite(new MConfiguration(), currentModel.read());
-        PlatformDdlWriter writer = new PlatformDdlWriter(databasePlatform, serverConfig);
-        writer.processMigration(dbMigration, write, writePath, nextMajorVersion);
+      logger.info("generating migration:{}", fullVersion);
+      if (!writeMigrationXml(dbMigration, modelDir, fullVersion)) {
+        logger.warn("migration already exists, not generating DDL");
+
+      } else {
+        if (databasePlatform != null) {
+          // writer needs the current model to provide table/column details for
+          // history ddl generation (triggers, history tables etc)
+          DdlWrite write = new DdlWrite(new MConfiguration(), currentModel.read());
+          PlatformDdlWriter writer = createDdlWriter(databasePlatform, "");
+          writer.processMigration(dbMigration, write, migrationDir , fullVersion);
+        }
+        writeExtraPlatformDdl(fullVersion, currentModel, dbMigration, migrationDir);
       }
 
-      writeExtraPlatformDdl(nextMajorVersion, currentModel, dbMigration, writePath);
-
     } finally {
-      DbOffline.reset();
+      if (!online) {
+        DbOffline.reset();
+      }
     }
   }
 
+  /**
+   * Return the full version for the migration being generated.
+   */
+  private String getFullVersion(MigrationModel migrationModel) {
+
+    String version = migrationConfig.getVersion();
+    if (version == null) {
+      version = migrationModel.getNextVersion(initialVersion);
+    }
+
+    String fullVersion = version;
+
+    String name = migrationConfig.getName();
+    if (name != null) {
+      fullVersion += "__" + toUnderScore(name);
+    }
+    return fullVersion;
+  }
+
+  /**
+   * Replace spaces with underscores.
+   */
+  private String toUnderScore(String name) {
+    return name.replace(' ','_');
+  }
+
   /**
    * Write any extra platform ddl.
    */
-  protected void writeExtraPlatformDdl(int nextMajorVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException {
+  protected void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException {
 
     for (Pair pair : platforms) {
       DdlWrite platformBuffer = new DdlWrite(new MConfiguration(), currentModel.read());
-
-      PlatformDdlWriter platformWriter = new PlatformDdlWriter(pair.platform, serverConfig, pair.prefix);
-      platformWriter.processMigration(dbMigration, platformBuffer, writePath, nextMajorVersion);
+      PlatformDdlWriter platformWriter = createDdlWriter(pair);
+      platformWriter.processMigration(dbMigration, platformBuffer, writePath, fullVersion);
     }
   }
 
+  private PlatformDdlWriter createDdlWriter(Pair pair) {
+    return createDdlWriter(pair.platform, pair.prefix);
+  }
+
+  private PlatformDdlWriter createDdlWriter(DatabasePlatform platform, String prefix) {
+    return new PlatformDdlWriter(platform, serverConfig, prefix, migrationConfig);
+  }
+
   /**
    * Write the migration xml.
    */
-  protected void writeMigrationXml(Migration dbMigration, File resourcePath, int migrationVersion) {
+  protected boolean writeMigrationXml(Migration dbMigration, File resourcePath, String fullVersion) {
 
-    File file = new File(resourcePath, "v"+migrationVersion+".0.xml");
+    String modelFile = fullVersion + migrationConfig.getModelSuffix();
+    File file = new File(resourcePath, modelFile);
+    if (file.exists()) {
+      return false;
+    }
     MigrationXmlWriter xmlWriter = new MigrationXmlWriter();
     xmlWriter.write(dbMigration, file);
+    return true;
   }
 
   /**
@@ -260,14 +327,13 @@ public class DbMigration {
   /**
    * Return the file path to write the xml and sql to.
    */
-  protected File getWritePath() {
+  protected File getMigrationDirectory() {
 
     // path to src/main/resources in typical maven project
     File resourceRootDir = new File(pathToResources);
+    String resourcePath = migrationConfig.getMigrationPath();
 
-    String resourcePath = migrationConfig.getResourcePath();
-
-    // expect to be a path to something like - src/main/resources/dbmigration/myapp
+    // expect to be a path to something like - src/main/resources/dbmigration/model
     File path = new File(resourceRootDir, resourcePath);
     if (!path.exists()) {
       if (!path.mkdirs()) {
@@ -277,6 +343,21 @@ public class DbMigration {
     return path;
   }
 
+  /**
+   * Return the model directory (relative to the migration directory).
+   */
+  protected File getModelDirectory(File migrationDirectory) {
+    String modelPath = migrationConfig.getModelPath();
+    if (modelPath ==  null || modelPath.isEmpty()) {
+      return migrationDirectory;
+    }
+    File modelDir = new File(migrationDirectory, migrationConfig.getModelPath());
+    if (!modelDir.exists() && !modelDir.mkdirs()) {
+      logger.debug("Unable to ensure migration model directory exists at {}", modelDir.getAbsolutePath());
+    }
+    return modelDir;
+  }
+
   /**
    * Return the DatabasePlatform given the platform key.
    */

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

@@ -21,6 +21,7 @@ import com.avaje.ebean.dbmigration.migration.DropTable;
 import com.avaje.ebean.dbmigration.migration.ForeignKey;
 import com.avaje.ebean.dbmigration.migration.UniqueConstraint;
 import com.avaje.ebean.dbmigration.model.MTable;
+import com.avaje.ebean.util.StringHelper;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -123,7 +124,11 @@ public class BaseTableDdl implements TableDdl {
       writePrimaryKeyConstraint(apply, createTable.getPkName(), toColumnNames(pk));
     }
 
-    apply.newLine().append(")").endOfStatement();
+    apply.newLine().append(")");
+    addTableCommentInline(apply, createTable);
+    apply.endOfStatement();
+
+    addComments(apply, createTable);
 
     writeUniqueOneToOneConstraints(writer, createTable);
 
@@ -150,6 +155,37 @@ public class BaseTableDdl implements TableDdl {
 
   }
 
+  /**
+   * Add table and column comments (separate from the create table statement).
+   */
+  private void addComments(DdlBuffer apply, CreateTable createTable) throws IOException {
+    if (!platformDdl.isInlineComments()) {
+      String tableComment = createTable.getComment();
+      if (!StringHelper.isNull(tableComment)) {
+        platformDdl.addTableComment(apply, createTable.getName(), tableComment);
+      }
+
+      List<Column> columns = createTable.getColumn();
+      for (Column column : columns) {
+        if (!StringHelper.isNull(column.getComment())) {
+          platformDdl.addColumnComment(apply, createTable.getName(), column.getName(), column.getComment());
+        }
+      }
+    }
+  }
+
+  /**
+   * Add the table comment inline with the create table statement.
+   */
+  private void addTableCommentInline(DdlBuffer apply, CreateTable createTable) throws IOException {
+    if (platformDdl.isInlineComments()) {
+      String tableComment = createTable.getComment();
+      if (!StringHelper.isNull(tableComment)) {
+        platformDdl.inlineTableComment(apply, tableComment);
+      }
+    }
+  }
+
   private void writeTableColumns(DdlBuffer apply, List<Column> columns, boolean useIdentity) throws IOException {
     platformDdl.writeTableColumns(apply, columns, useIdentity);
   }

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

@@ -160,8 +160,10 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
 
     Collection<MColumn> cols = table.getColumns().values();
     for (MColumn column : cols) {
-      writeColumnDefinition(apply, column.getName(), column.getType());
-      apply.append(",").newLine();
+      if (!column.isDraftOnly()) {
+        writeColumnDefinition(apply, column.getName(), column.getType());
+        apply.append(",").newLine();
+      }
     }
     writeColumnDefinition(apply, sysPeriodStart, sysPeriodType);
     apply.append(",").newLine();
@@ -232,7 +234,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl {
     List<String> includedColumns = new ArrayList<String>(columns.size());
 
     for (MColumn column : columns) {
-      if (!column.isHistoryExclude()) {
+      if (column.isIncludeInHistory()) {
         includedColumns.add(column.getName());
       }
     }

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

@@ -2,8 +2,11 @@ package com.avaje.ebean.dbmigration.ddlgeneration.platform;
 
 import com.avaje.ebean.config.dbplatform.DbIdentity;
 import com.avaje.ebean.config.dbplatform.DbTypeMap;
+import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer;
 import com.avaje.ebean.dbmigration.migration.AlterColumn;
 
+import java.io.IOException;
+
 /**
  * MS SQL Server platform specific DDL.
  */
@@ -15,6 +18,7 @@ public class MsSqlServerDdl extends PlatformDdl {
     this.foreignKeyRestrict = "";
     this.inlineUniqueOneToOne = false;
     this.columnSetDefault = "add default";
+    this.dropConstraintIfExists = "drop constraint";
   }
 
   @Override
@@ -83,4 +87,20 @@ public class MsSqlServerDdl extends PlatformDdl {
     // can't alter itself - done in alterColumnBaseAttributes()
     return null;
   }
+
+  /**
+   * Add table comment as a separate statement (from the create table statement).
+   */
+  public void addTableComment(DdlBuffer apply, String tableName, String tableComment) throws IOException {
+
+    // do nothing for MS SQL Server (cause it requires stored procedures etc)
+  }
+
+  /**
+   * Add column comment as a separate statement.
+   */
+  public void addColumnComment(DdlBuffer apply, String table, String column, String comment) throws IOException {
+
+    // do nothing for MS SQL Server (cause it requires stored procedures etc)
+  }
 }

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

@@ -2,7 +2,12 @@ package com.avaje.ebean.dbmigration.ddlgeneration.platform;
 
 import com.avaje.ebean.config.dbplatform.DbIdentity;
 import com.avaje.ebean.config.dbplatform.DbTypeMap;
+import com.avaje.ebean.dbmigration.ddlgeneration.DdlBuffer;
 import com.avaje.ebean.dbmigration.migration.AlterColumn;
+import com.avaje.ebean.dbmigration.migration.Column;
+import com.avaje.ebeaninternal.server.lib.util.StringHelper;
+
+import java.io.IOException;
 
 /**
  * MySql specific DDL.
@@ -14,6 +19,7 @@ public class MySqlDdl extends PlatformDdl {
     this.alterColumn =  "modify";
     this.dropUniqueConstraint = "drop index";
     this.historyDdl = new MySqlHistoryDdl();
+    this.inlineComments = true;
   }
 
   /**
@@ -64,4 +70,26 @@ public class MySqlDdl extends PlatformDdl {
     // use modify
     return "alter table " + tableName + " modify " + columnName + " " + type + notnullClause;
   }
+
+  @Override
+  protected void writeColumnDefinition(DdlBuffer buffer, Column column, boolean useIdentity) throws IOException {
+    super.writeColumnDefinition(buffer, column, useIdentity);
+    String comment = column.getComment();
+    if (!StringHelper.isNull(comment)) {
+      // in mysql 5.5 column comment save in information_schema.COLUMNS.COLUMN_COMMENT(VARCHAR 1024)
+      if (comment.length() > 500) {
+        comment = comment.substring(0, 500);
+      }
+      buffer.append(String.format(" comment '%s'", comment));
+    }
+
+  }
+
+  public void inlineTableComment(DdlBuffer apply, String tableComment) throws IOException {
+    if (tableComment.length() > 1000) {
+      tableComment = tableComment.substring(0, 1000);
+    }
+    apply.append(" comment='").append(tableComment).append("'");
+  }
+
 }

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

@@ -37,6 +37,11 @@ public class PlatformDdl {
    */
   private final DbIdentity dbIdentity;
 
+  /**
+   * Set to true if table and column comments are included inline with the create statements.
+   */
+  protected boolean inlineComments;
+
   /**
    * Default assumes if exists is supported.
    */
@@ -53,6 +58,8 @@ public class PlatformDdl {
 
   protected String identitySuffix = " auto_increment";
 
+  protected String alterTableIfExists = "";
+
   protected String dropConstraintIfExists = "drop constraint if exists";
 
   protected String dropIndexIfExists = "drop index if exists ";
@@ -114,6 +121,13 @@ public class PlatformDdl {
     return columnDefn + identitySuffix;
   }
 
+  /**
+   * Return true if the table and column comments are included inline.
+   */
+  public boolean isInlineComments() {
+    return inlineComments;
+  }
+
   /**
    * Write all the table columns converting to platform types as necessary.
    */
@@ -150,7 +164,7 @@ public class PlatformDdl {
    * Return the drop foreign key clause.
    */
   public String alterTableDropForeignKey(String tableName, String fkName) {
-    return "alter table " + tableName + " " + dropConstraintIfExists + " " + fkName;
+    return "alter table " + alterTableIfExists + tableName + " " + dropConstraintIfExists + " " + fkName;
   }
 
   /**
@@ -384,4 +398,27 @@ public class PlatformDdl {
   protected boolean isTrue(Boolean value) {
     return Boolean.TRUE.equals(value);
   }
+
+  /**
+   * Add an inline table comment to the create table statement.
+   */
+  public void inlineTableComment(DdlBuffer apply, String tableComment) throws IOException {
+    // do nothing by default (MySql only)
+  }
+
+  /**
+   * Add table comment as a separate statement (from the create table statement).
+   */
+  public void addTableComment(DdlBuffer apply, String tableName, String tableComment) throws IOException {
+
+    apply.append(String.format("comment on table %s is '%s'", tableName, tableComment)).endOfStatement();
+  }
+
+  /**
+   * Add column comment as a separate statement.
+   */
+  public void addColumnComment(DdlBuffer apply, String table, String column, String comment) throws IOException {
+
+    apply.append(String.format("comment on column %s.%s is '%s'", table, column, comment)).endOfStatement();
+  }
 }

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

@@ -13,6 +13,7 @@ public class PostgresDdl extends PlatformDdl {
     this.historyDdl = new PostgresHistoryDdl();
     this.dropTableCascade = " cascade";
     this.columnSetType = "type ";
+    this.alterTableIfExists = "if exists ";
   }
 
   /**

src/main/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlReader.java

@@ -6,6 +6,9 @@ import com.avaje.ebean.dbmigration.migration.Migration;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 
 /**
@@ -15,19 +18,6 @@ public class MigrationXmlReader {
 
   private static final MigrationXmlReader INSTANCE = new MigrationXmlReader();
 
-  /**
-   * Read and return a Migration from an xml document at the given resource path.
-   */
-  public static Migration readMaybe(String resourcePath) {
-
-    InputStream is = MigrationXmlReader.class.getResourceAsStream(resourcePath);
-    if (is == null) {
-      return null;
-    }
-
-    return INSTANCE.read(is);
-  }
-
   /**
    * Read and return a Migration from an xml document at the given resource path.
    */
@@ -41,10 +31,27 @@ public class MigrationXmlReader {
     return INSTANCE.read(is);
   }
 
+  /**
+   * Read and return a Migration from a migration xml file.
+   */
+  public static Migration read(File migrationFile) {
+
+    try {
+      FileInputStream is = new FileInputStream(migrationFile);
+      try {
+        return read(is);
+      } finally {
+        is.close();
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   /**
    * Read and return a Migration from an xml document.
    */
-  public Migration read(InputStream is) {
+  public static Migration read(InputStream is) {
 
     try {
       JAXBContext jaxbContext = JAXBContext.newInstance(Migration.class);

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

@@ -16,6 +16,7 @@ public class MColumn {
   private String references;
   private String foreignKeyName;
   private String foreignKeyIndex;
+  private String comment;
 
   private boolean historyExclude;
   private boolean notnull;
@@ -43,6 +44,7 @@ public class MColumn {
     this.checkConstraint = column.getCheckConstraint();
     this.checkConstraintName = column.getCheckConstraintName();
     this.defaultValue = column.getDefaultValue();
+    this.comment = column.getComment();
     this.references = column.getReferences();
     this.foreignKeyName = column.getForeignKeyName();
     this.foreignKeyIndex = column.getForeignKeyIndex();
@@ -76,6 +78,7 @@ public class MColumn {
     copy.checkConstraintName = checkConstraintName;
     copy.defaultValue = defaultValue;
     copy.references = references;
+    copy.comment = comment;
     copy.foreignKeyName = foreignKeyName;
     copy.foreignKeyIndex = foreignKeyIndex;
     copy.historyExclude = historyExclude;
@@ -198,6 +201,19 @@ public class MColumn {
     return uniqueOneToOne;
   }
 
+  /**
+   * Return the column comment.
+   */
+  public String getComment() {
+    return comment;
+  }
+
+  /**
+   * Set the column comment.
+   */
+  public void setComment(String comment) {
+    this.comment = comment;
+  }
 
   /**
    * Set the draftOnly status for this column.
@@ -213,6 +229,13 @@ public class MColumn {
     return draftOnly;
   }
 
+  /**
+   * Return true if this column should be included in History DB triggers etc.
+   */
+  public boolean isIncludeInHistory() {
+    return !draftOnly && !historyExclude;
+  }
+
   public Column createColumn() {
 
     Column c = new Column();
@@ -230,6 +253,7 @@ public class MColumn {
     c.setForeignKeyName(foreignKeyName);
     c.setForeignKeyIndex(foreignKeyIndex);
     c.setDefaultValue(defaultValue);
+    c.setComment(comment);
     c.setUnique(unique);
     c.setUniqueOneToOne(uniqueOneToOne);
 

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

@@ -325,6 +325,10 @@ public class MTable {
     return comment;
   }
 
+  public void setComment(String comment) {
+    this.comment = comment;
+  }
+
   public String getTablespace() {
     return tablespace;
   }

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

@@ -1,12 +1,13 @@
 package com.avaje.ebean.dbmigration.model;
 
-import com.avaje.ebean.dbmigration.migration.Migration;
-import com.avaje.ebean.dbmigration.migrationreader.MigrationXmlReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.io.File;
+import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Build the model from the series of migrations.
@@ -17,26 +18,15 @@ public class MigrationModel {
 
   private final ModelContainer model = new ModelContainer();
 
-  private final Set<String> readVersions = new LinkedHashSet<String>();
+  private final File modelDirectory;
 
-  private final String resourcePath;
+  private final String modelSuffix;
 
-  int nextMajorVersion;
+  private MigrationVersion lastVersion;
 
-  public MigrationModel(String resourcePath) {
-    this.resourcePath = normaliseResourcePath(resourcePath);
-  }
-
-  private String normaliseResourcePath(String resourcePath) {
-    if (resourcePath.endsWith("/")) {
-      // trim trailing slash
-      resourcePath = resourcePath.substring(0, resourcePath.length()-1);
-    }
-    if (resourcePath.startsWith("/")) {
-      // trim leading slash
-      resourcePath = resourcePath.substring(1);
-    }
-    return resourcePath;
+  public MigrationModel(File modelDirectory, String modelSuffix) {
+    this.modelDirectory = modelDirectory;
+    this.modelSuffix = modelSuffix;
   }
 
   /**
@@ -46,57 +36,41 @@ public class MigrationModel {
   public ModelContainer read() {
 
     readMigrations();
-    logger.info("read versions {}", readVersions);
     return model;
   }
 
-  /**
-   * Return the set of versions that were read.
-   */
-  public Set<String> getReadVersions() {
-    return readVersions;
-  }
-
-  public int getNextMajorVersion() {
-    return nextMajorVersion;
-  }
-
   private void readMigrations() {
 
-    for (int majorVersion = 1; majorVersion < 100; majorVersion++) {
-      if (!readMinorVersions(majorVersion)){
-        // no major.0 version so stopping
-        nextMajorVersion = majorVersion;
-        return;
+    // find all the migration xml files
+    File[] xmlFiles = modelDirectory.listFiles(new FileFilter() {
+      @Override
+      public boolean accept(File pathname) {
+        return pathname.getName().toLowerCase().endsWith(modelSuffix);
       }
+    });
+
+    List<MigrationResource> resources = new ArrayList<MigrationResource>();
+
+    for (File xmlFile: xmlFiles) {
+      resources.add(new MigrationResource(xmlFile));
+    }
+
+    // sort into version order before applying
+    Collections.sort(resources);
+
+    for (MigrationResource migrationResource: resources) {
+      logger.debug("read {}", migrationResource);
+      model.apply(migrationResource.read());
+    }
+
+    // remember the last version
+    if (!resources.isEmpty()) {
+      lastVersion = resources.get(resources.size() - 1).getVersion();
     }
   }
 
-  private boolean readMinorVersions(int majorVersion) {
+  public String getNextVersion(String initialVersion) {
 
-    for (int minorVersion = 0; minorVersion < 100; minorVersion++) {
-      if (!readMigration(majorVersion, minorVersion)) {
-        // continue reading next major if minorVersion 0 was read
-        return (minorVersion > 0);
-      }
-    }
-    return true;
+    return lastVersion == null ? initialVersion : lastVersion.nextVersion();
   }
-
-  private boolean readMigration(int majorVersion, int minorVersion) {
-
-    String version = majorVersion+"."+minorVersion;
-    String path = "/"+resourcePath+"/v"+version+".xml";
-
-    Migration migration = MigrationXmlReader.readMaybe(path);
-    if (migration == null) {
-      logger.debug("... no migration at path:{}", path);
-      return false;
-    }
-    readVersions.add(version);
-    logger.trace("... read migration v{}", version);
-    model.apply(migration);
-    return true;
-  }
-
 }

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

@@ -0,0 +1,51 @@
+package com.avaje.ebean.dbmigration.model;
+
+import com.avaje.ebean.dbmigration.migration.Migration;
+import com.avaje.ebean.dbmigration.migrationreader.MigrationXmlReader;
+
+import java.io.File;
+
+/**
+ * Migration XML resource that holds the changes to be applied.
+ */
+public class MigrationResource implements Comparable<MigrationResource> {
+
+  private final File migrationFile;
+
+  private final MigrationVersion version;
+
+  /**
+   * Construct with a migration xml file.
+   */
+  public MigrationResource(File migrationFile) {
+    this.migrationFile = migrationFile;
+    this.version = MigrationVersion.parse(migrationFile.getName());
+  }
+
+  public String toString() {
+    return migrationFile.getName();
+  }
+
+  /**
+   * Return the version associated with this resource.
+   */
+  public MigrationVersion getVersion() {
+    return version;
+  }
+
+  /**
+   * Read and return the migration from the resource.
+   */
+  public Migration read() {
+
+    return MigrationXmlReader.read(migrationFile);
+  }
+
+  /**
+   * Compare by underlying version.
+   */
+  @Override
+  public int compareTo(MigrationResource other) {
+    return version.compareTo(other.version);
+  }
+}

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

@@ -0,0 +1,86 @@
+package com.avaje.ebean.dbmigration.model;
+
+/**
+ * The version of a migration used so that migrations are processed in order.
+ */
+public class MigrationVersion implements Comparable<MigrationVersion> {
+
+  /**
+   * The raw version text.
+   */
+  private final String raw;
+
+  /**
+   * The ordering parts.
+   */
+  private final int[] ordering;
+
+  private MigrationVersion(String raw, int[] ordering) {
+    this.raw = raw;
+    this.ordering = ordering;
+  }
+
+  public String toString() {
+    return raw;
+  }
+
+
+  public String nextVersion() {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < ordering.length; i++) {
+      if (i < ordering.length -1 ) {
+        sb.append(ordering[i]).append(".");
+      } else {
+        sb.append(ordering[i]+1);
+      }
+    }
+    return sb.toString();
+  }
+
+  @Override
+  public int compareTo(MigrationVersion other) {
+
+    int otherLength = other.ordering.length;
+    for (int i = 0; i < ordering.length; i++) {
+      if (i >= otherLength) {
+        // considered greater
+        return 1;
+      }
+      if (ordering[i] != other.ordering[i]) {
+        return (ordering[i] > other.ordering[i]) ? 1 : -1;
+      }
+    }
+    // considered the same
+    return 0;
+  }
+
+  /**
+   * Parse the raw version string into a MigrationVersion.
+   */
+  public static MigrationVersion parse(String raw) {
+
+    String value = raw.replace("__",".");
+    value = value.replace('_','.');
+
+    String[] sections = value.split("\\.");
+
+    int[] ordering = new int[sections.length];
+
+    int stopIndex = 0;
+    for (int i = 0; i < sections.length; i++) {
+      try {
+        ordering[i] = Integer.parseInt(sections[i]);
+        stopIndex++;
+      } catch (NumberFormatException e) {
+        // stop parsing
+        break;
+      }
+    }
+
+    int[] actualOrder = new int[stopIndex];
+    System.arraycopy(ordering, 0, actualOrder, 0, stopIndex);
+
+    return new MigrationVersion(raw, actualOrder);
+  }
+
+}

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

@@ -1,5 +1,6 @@
 package com.avaje.ebean.dbmigration.model;
 
+import com.avaje.ebean.config.DbMigrationConfig;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
 import com.avaje.ebean.dbmigration.ddlgeneration.DdlHandler;
@@ -24,20 +25,19 @@ public class PlatformDdlWriter {
 
   private final String platformPrefix;
 
-  public PlatformDdlWriter(DatabasePlatform platform, ServerConfig serverConfig) {
-    this(platform, serverConfig, "");
-  }
+  private final DbMigrationConfig config;
 
-  public PlatformDdlWriter(DatabasePlatform platform, ServerConfig serverConfig, String platformPrefix) {
+  public PlatformDdlWriter(DatabasePlatform platform, ServerConfig serverConfig, String platformPrefix, DbMigrationConfig config) {
     this.platform = platform;
     this.serverConfig = serverConfig;
     this.platformPrefix = platformPrefix;
+    this.config = config;
   }
 
   /**
    * Write the migration as platform specific ddl.
    */
-  public void processMigration(Migration dbMigration, DdlWrite write, File writePath, int nextMajorVersion) throws IOException {
+  public void processMigration(Migration dbMigration, DdlWrite write, File writePath, String fullVersion) throws IOException {
 
     DdlHandler handler = handler();
 
@@ -49,16 +49,16 @@ public class PlatformDdlWriter {
     }
     handler.generateExtra(write);
 
-    writePlatformDdl(write, writePath, nextMajorVersion);
+    writePlatformDdl(write, writePath, fullVersion);
   }
 
   /**
    * Write the ddl files.
    */
-  protected void writePlatformDdl(DdlWrite write, File resourcePath, int migrationVersion) throws IOException {
+  protected void writePlatformDdl(DdlWrite write, File resourcePath, String fullVersion) throws IOException {
 
     if (!write.isApplyEmpty()) {
-      FileWriter applyWriter = createWriter(resourcePath, migrationVersion, "apply.sql");
+      FileWriter applyWriter = createWriter(resourcePath, fullVersion, "", config.getApplySuffix());
       try {
         writeApplyDdl(applyWriter, write);
         applyWriter.flush();
@@ -66,8 +66,8 @@ public class PlatformDdlWriter {
         applyWriter.close();
       }
 
-      if (!write.isApplyRollbackEmpty()) {
-        FileWriter applyRollbackWriter = createWriter(resourcePath, migrationVersion, "applyRollback.sql");
+      if (!config.isSuppressRollback() && !write.isApplyRollbackEmpty()) {
+        FileWriter applyRollbackWriter = createWriter(resourcePath, fullVersion, config.getRollbackPath(), config.getRollbackSuffix());
         try {
           writeApplyRollbackDdl(applyRollbackWriter, write);
           applyRollbackWriter.flush();
@@ -78,7 +78,7 @@ public class PlatformDdlWriter {
     }
 
     if (!write.isDropEmpty()) {
-      FileWriter dropWriter = createWriter(resourcePath, migrationVersion, "drop.sql");
+      FileWriter dropWriter = createWriter(resourcePath, fullVersion, config.getDropPath(), config.getDropSuffix());
       try {
         writeDropDdl(dropWriter, write);
         dropWriter.flush();
@@ -88,12 +88,28 @@ public class PlatformDdlWriter {
     }
   }
 
-  protected FileWriter createWriter(File resourcePath, int migrationVersion, String suffix) throws IOException {
+  protected FileWriter createWriter(File path, String fullVersion, String subPath, String suffix) throws IOException {
 
-    File applyFile = new File(resourcePath, "v" + migrationVersion + ".0-" + platformPrefix + suffix);
+    String fileName = fullVersion;
+    if (!platformPrefix.isEmpty()) {
+      fileName += "-"+platformPrefix;
+    }
+    if (subPath != null && !subPath.isEmpty()) {
+      path = subPath(path, subPath);
+    }
+    fileName += suffix;
+    File applyFile = new File(path,  fileName);
     return new FileWriter(applyFile);
   }
 
+  protected File subPath(File path, String suffix) {
+    File subPath = new File(path, suffix);
+    if (!subPath.exists()) {
+      subPath.mkdirs();
+    }
+    return subPath;
+  }
+
   /**
    * Write the 'Apply' DDL buffers to the writer.
    */

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

@@ -35,6 +35,7 @@ public class ModelBuildBeanVisitor implements BeanVisitor {
     }
 
     MTable table = new MTable(descriptor.getBaseTable());
+    table.setComment(descriptor.getDbComment());
     if (descriptor.isHistorySupport()) {
       table.setWithHistory(true);
       BeanProperty whenCreated = descriptor.findWhenCreatedProperty();

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

@@ -10,6 +10,7 @@ import com.avaje.ebeaninternal.server.deploy.BeanProperty;
 import com.avaje.ebeaninternal.server.type.ScalarType;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * The context used during DDL generation.
@@ -134,11 +135,22 @@ public class ModelBuildContext {
   /**
    * Create the draft table for a given table.
    */
-  public void createDraft(MTable table) {
+  public void createDraft(MTable table, boolean draftable) {
 
     MTable draftTable = table.createDraftTable();
     draftTable.setPkName(primaryKeyName(draftTable.getName()));
 
+    if (draftable) {
+      // Add a FK from @Draftable live table back to it's draft table)
+      List<MColumn> pkCols = table.primaryKeyColumns();
+      if (pkCols.size() == 1) {
+        // only doing this for single column PK at this stage
+        MColumn pk = pkCols.get(0);
+        pk.setReferences(draftTable.getName() + "." + pk.getName());
+        pk.setForeignKeyName(foreignKeyConstraintName(table.getName(), pk.getName(), 0));
+      }
+    }
+
     int fkCount = 0;
     int ixCount = 0;
     int uqCount = 0;

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

@@ -44,7 +44,7 @@ public class ModelBuildIntersectionTable {
     buildFkConstraints();
 
     if (manyProp.getTargetDescriptor().isDraftable()) {
-      ctx.createDraft(intersectionTable);
+      ctx.createDraft(intersectionTable, false);
     }
 
 	}

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

@@ -112,7 +112,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
   private void addDraftTable() {
     if (beanDescriptor.isDraftable() || beanDescriptor.isDraftableElement()) {
       // create a 'Draft' table which looks very similar (change PK, FK etc)
-      ctx.createDraft(table);
+      ctx.createDraft(table, !beanDescriptor.isDraftableElement());
     }
   }
 
@@ -230,6 +230,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
     }
 
     MColumn col = new MColumn(p.getDbColumn(), ctx.getColumnDefn(p));
+    col.setComment(p.getDbComment());
     col.setDraftOnly(p.isDraftOnly());
 
     if (p.isId()) {

src/main/java/com/avaje/ebean/util/ClassUtil.java

@@ -9,20 +9,6 @@ import java.util.Arrays;
  */
 public class ClassUtil {
 
-  /**
-   * Return a new instance of the class using the default constructor.
-   */
-  public static Object newInstance(String className) {
-    try {
-      Class<?> cls = Class.forName(className);
-      return cls.newInstance();
-    } catch (Exception e) {
-      String msg = "Error constructing " + className;
-      throw new IllegalArgumentException(msg, e);
-    }
-  }
-
-
   /**
    * Returns the raw type for the 2nd generic parameter for a subclass.
    */

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

@@ -1,146 +0,0 @@
-package com.avaje.ebeaninternal.api;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Wraps the caller and context class loaders.
- * <p>
- * Helper for ClassUtil.
- * </p>
- *
- * @author rbygrave
- */
-class ClassLoadContext {
-
-  private static final Logger logger = LoggerFactory.getLogger(ClassLoadContext.class);
-
-  private final ClassLoader callerLoader;
-
-  private final ClassLoader contextLoader;
-
-  private final boolean preferContext;
-
-  private boolean ambiguous;
-
-  public static ClassLoadContext of(Class<?> caller, boolean preferContext) {
-    return new ClassLoadContext(caller, preferContext);
-  }
-
-  /**
-   * This constructor is package-private to restrict instantiation to
-   */
-  ClassLoadContext(final Class<?> caller, boolean preferContext) {
-    if (caller == null) {
-      throw new IllegalArgumentException("caller is null");
-    }
-    this.callerLoader = caller.getClassLoader();
-    this.contextLoader = Thread.currentThread().getContextClassLoader();
-    this.preferContext = preferContext;
-  }
-
-  public Class<?> forName(String name) throws ClassNotFoundException {
-
-    ClassLoader defaultLoader = getDefault(preferContext);
-
-    try {
-      return Class.forName(name, true, defaultLoader);
-    } catch (ClassNotFoundException e) {
-      if (callerLoader == defaultLoader) {
-        throw e;
-      } else {
-        return Class.forName(name, true, callerLoader);
-      }
-    }
-  }
-
-
-  /**
-   * Return the expected class loader to use.
-   * <p>
-   * Works on the assumption that the child of the caller or context class
-   * loader is preferred.
-   * </p>
-   */
-  public ClassLoader getDefault(boolean preferContext) {
-
-    if (contextLoader == null) {
-      if (logger.isDebugEnabled()) {
-        logger.debug("No Context ClassLoader, using " + callerLoader.getClass().getName());
-      }
-      return callerLoader;
-    }
-    if (contextLoader == callerLoader) {
-      if (logger.isDebugEnabled()) {
-        logger.debug("Context and Caller ClassLoader's same instance of " + contextLoader.getClass().getName());
-      }
-      return callerLoader;
-    }
-
-    if (isChild(contextLoader, callerLoader)) {
-      if (logger.isDebugEnabled()) {
-        logger.debug("Caller ClassLoader " + callerLoader.getClass().getName()
-            + " child of ContextLoader " + contextLoader.getClass().getName());
-      }
-      return callerLoader;
-
-    } else if (isChild(callerLoader, contextLoader)) {
-      if (logger.isDebugEnabled()) {
-        logger.debug("Context ClassLoader " + contextLoader.getClass().getName()
-            + " child of Caller ClassLoader " + callerLoader.getClass().getName());
-      }
-      return contextLoader;
-
-    } else {
-      // ambiguous case, perhaps both null
-      logger.debug("Ambiguous ClassLoader choice preferContext:" + preferContext
-          + " Context:" + contextLoader.getClass().getName() + " Caller:" + callerLoader.getClass().getName());
-      ambiguous = true;
-      return preferContext ? contextLoader : callerLoader;
-    }
-  }
-
-  /**
-   * Return true if the 'default' class loader is ambiguous.
-   */
-  public boolean isAmbiguous() {
-    return ambiguous;
-  }
-
-  /**
-   * Return the ClassLoader of the caller.
-   */
-  public ClassLoader getCallerLoader() {
-    return callerLoader;
-  }
-
-  /**
-   * Return the Thread Context ClassLoader.
-   */
-  public ClassLoader getContextLoader() {
-    return contextLoader;
-  }
-
-  /**
-   * Return the ClassLoader for this class.
-   */
-  public ClassLoader getThisLoader() {
-    return this.getClass().getClassLoader();
-  }
-
-  /**
-   * Returns 'true' if 'loader2' is a delegation child of 'loader1' [or if
-   * 'loader1'=='loader2'].
-   */
-  private boolean isChild(final ClassLoader loader1, ClassLoader loader2) {
-
-    for (; loader2 != null; loader2 = loader2.getParent()) {
-      if (loader2 == loader1) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-}

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

@@ -6,79 +6,60 @@ package com.avaje.ebeaninternal.api;
  */
 public class ClassUtil {
 
-  /**
-   * Load a class taking into account a context class loader (if present).
-   */
-  public static Class<?> forName(String name, Class<?> caller) throws ClassNotFoundException {
-
-    if (caller == null) {
-      caller = ClassUtil.class;
-    }
-    ClassLoadContext ctx = ClassLoadContext.of(caller, true);
-    return ctx.forName(name);
-  }
-
-  /**
-   * Return true if javax validation annotations like Size and NotNull are present.
-   */
-  public static boolean isJavaxValidationAnnotationsPresent() {
-    return isPresent("javax.validation.constraints.NotNull", null);
-  }
-
-  /**
-   * Return true if Jackson annotations like JsonIgnore are present.
-   */
-  public static boolean isJacksonAnnotationsPresent() {
-    return isPresent("com.fasterxml.jackson.annotation.JsonIgnore", null);
-  }
-
-  /**
-   * Return true if Jackson ObjectMapper is present.
-   */
-  public static boolean isJacksonObjectMapperPresent() {
-    return isPresent("com.fasterxml.jackson.databind.ObjectMapper", null);
-  }
-
-
-  /**
-   * Return true if the given class is present.
-   */
-  public static boolean isPresent(String className) {
-    return isPresent(className, null);
-  }
-
-  /**
-   * Return true if the given class is present.
-   */
-  public static boolean isPresent(String className, Class<?> caller) {
-    try {
-      forName(className, caller);
-      return true;
-    } catch (Throwable ex) {
-      // Class or one of its dependencies is not present...
-      return false;
-    }
-  }
-
   /**
    * Return a new instance of the class using the default constructor.
    */
   public static Object newInstance(String className) {
-    return newInstance(className, null);
-  }
-
-  /**
-   * Return a new instance of the class using the default constructor.
-   */
-  public static Object newInstance(String className, Class<?> caller) {
 
     try {
-      Class<?> cls = forName(className, caller);
+      Class<?> cls = forName(className);
       return cls.newInstance();
     } catch (Exception e) {
       String msg = "Error constructing " + className;
       throw new IllegalArgumentException(msg, e);
     }
   }
+
+  /**
+   * Load a class taking into account a context class loader (if present).
+   */
+  private static Class<?> forName(String name) throws ClassNotFoundException {
+    return new ClassLoadContext().forName(name);
+  }
+
+
+  /**
+   * Helper to wrap the context and caller classLoaders (to use/try both).
+   */
+  static class ClassLoadContext {
+
+    private final ClassLoader contextLoader;
+
+    private final ClassLoader callerLoader;
+
+    ClassLoadContext() {
+      this.callerLoader = ClassUtil.class.getClassLoader();
+      this.contextLoader = contextLoader();
+    }
+
+    ClassLoader contextLoader() {
+      ClassLoader loader = Thread.currentThread().getContextClassLoader();
+      return (loader != null) ? loader: callerLoader;
+    }
+
+    public Class<?> forName(String name) throws ClassNotFoundException {
+
+      try {
+        return Class.forName(name, true, contextLoader);
+      } catch (ClassNotFoundException e) {
+        if (callerLoader == contextLoader) {
+          throw e;
+        } else {
+          return Class.forName(name, true, callerLoader);
+        }
+      }
+    }
+
+  }
 }
 

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

@@ -100,6 +100,7 @@ public interface SpiQuery<T> extends Query<T> {
      * Includes soft deletes rows in the result.
      */
     SOFT_DELETED,
+
     /**
      * Query runs against draft tables.
      */

src/main/java/com/avaje/ebeaninternal/server/core/DefaultBeanLoader.java

@@ -401,8 +401,10 @@ public class DefaultBeanLoader {
       ebi.setPersistenceContext(pc);
     }
 
+    boolean draft = desc.isDraftInstance(bean);
+
     if (embeddedOwnerIndex == -1) {
-      if (SpiQuery.Mode.LAZYLOAD_BEAN.equals(mode) && desc.isBeanCaching()) {
+      if (!draft && SpiQuery.Mode.LAZYLOAD_BEAN.equals(mode) && desc.isBeanCaching()) {
         // lazy loading and the bean cache is active 
         if (desc.cacheBeanLoad(bean, ebi, id)) {
           return;
@@ -415,10 +417,12 @@ public class DefaultBeanLoader {
 
     SpiQuery<?> query = (SpiQuery<?>) server.createQuery(desc.getBeanType());
     query.setLazyLoadProperty(ebi.getLazyLoadProperty());
+    if (draft) {
+      query.asDraft();
+    }
 
     if (embeddedOwnerIndex > -1) {
-      String embeddedBeanPropertyName = ebi.getProperty(embeddedOwnerIndex);
-      query.select("id," + embeddedBeanPropertyName);
+      query.select("id," + ebi.getProperty(embeddedOwnerIndex));
     }
 
     // don't collect AutoTune usage profiling information

src/main/java/com/avaje/ebeaninternal/server/core/DefaultContainer.java

@@ -20,6 +20,7 @@ import com.avaje.ebeaninternal.server.cluster.ClusterManager;
 import com.avaje.ebeaninternal.server.lib.ShutdownManager;
 import com.avaje.ebeaninternal.server.lib.sql.DataSourceAlert;
 import com.avaje.ebeaninternal.server.lib.sql.DataSourcePool;
+import com.avaje.ebeaninternal.server.lib.sql.DataSourcePoolListener;
 import com.avaje.ebeaninternal.server.lib.sql.SimpleDataSourceAlert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,8 +47,6 @@ public class DefaultContainer implements SpiContainer {
 
   private final JndiDataSourceLookup jndiDataSourceFactory;
 
-//  private final AtomicInteger serverId = new AtomicInteger(1);
-
   public DefaultContainer(ContainerConfig containerConfig) {
 
     this.clusterManager = new ClusterManager(containerConfig);
@@ -115,7 +114,6 @@ public class DefaultContainer implements SpiContainer {
 
       ServerCacheManager cacheManager = getCacheManager(serverConfig);
 
-//      int uniqueServerId = serverId.incrementAndGet();
       SpiBackgroundExecutor bgExecutor = createBackgroundExecutor(serverConfig);
 
       XmlConfigLoader xmlConfigLoader = new XmlConfigLoader(null);
@@ -127,19 +125,6 @@ public class DefaultContainer implements SpiContainer {
 
       cacheManager.init(server);
 
-//      if (serverConfig.isRegisterJmxMBeans()) {
-//        MBeanServer mbeanServer;
-//        ArrayList<?> list = MBeanServerFactory.findMBeanServer(null);
-//        if (list.size() == 0) {
-//          // probably not running in a server
-//          mbeanServer = MBeanServerFactory.createMBeanServer();
-//        } else {
-//          // use the first MBeanServer
-//          mbeanServer = (MBeanServer) list.get(0);
-//        }
-//        server.registerMBeans(mbeanServer, uniqueServerId);
-//      }
-
       // generate and run DDL if required
       // if there are any other tasks requiring action in their plugins, do them as well
       if (!DbOffline.isRunningMigration()) {
@@ -311,7 +296,17 @@ public class DefaultContainer implements SpiContainer {
     }
 
     DataSourceAlert notify = new SimpleDataSourceAlert();
-    return new DataSourcePool(notify, config.getName(), dsConfig);
+    DataSourcePoolListener listener = createListener(config, dsConfig);
+
+    return new DataSourcePool(notify, config.getName(), dsConfig, listener);
+  }
+
+  /**
+   * Create and return a DataSourcePoolListener if it has been specified.
+   */
+  private DataSourcePoolListener createListener(ServerConfig config, DataSourceConfig dsConfig) {
+    String poolListener = dsConfig.getPoolListener();
+    return poolListener != null ? (DataSourcePoolListener) config.getClassLoadConfig().newInstance(poolListener) : null;
   }
 
   /**

src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java

@@ -9,6 +9,7 @@ import com.avaje.ebean.bean.ObjectGraphNode;
 import com.avaje.ebean.bean.PersistenceContext;
 import com.avaje.ebean.bean.PersistenceContext.WithOption;
 import com.avaje.ebean.cache.ServerCacheManager;
+import com.avaje.ebean.config.DbMigrationConfig;
 import com.avaje.ebean.config.EncryptKeyManager;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
@@ -70,6 +71,7 @@ import com.avaje.ebeaninternal.util.ParamTypeHelper.TypeInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.util.ArrayList;
@@ -372,6 +374,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Start any services after registering with the ClusterManager.
    */
   public void start() {
+    DbMigrationConfig migrationConfig = serverConfig.getMigrationConfig();
+    if (migrationConfig != null) {
+      migrationConfig.generateOnStart(this);
+    }
   }
 
   /**
@@ -1218,13 +1224,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
     // a query that is expected to return either 0 or 1 rows
     List<T> list = findList(query, t);
+    return extractUnique(list);
+  }
 
-    if (list.size() == 0) {
+  private <T> T extractUnique(List<T> list) {
+    if (list.isEmpty()) {
       return null;
-      
+
     } else if (list.size() > 1) {
-      throw new PersistenceException("Unique expecting 0 or 1 rows but got [" + list.size() + "]");
-      
+      throw new NonUniqueResultException("Unique expecting 0 or 1 results but got [" + list.size() + "]");
+
     } else {
       return list.get(0);
     }
@@ -1380,6 +1389,18 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new LimitOffsetPagedList<T>(this, (SpiQuery<T>)query, pageIndex, pageSize);
   }
 
+  @Override
+  public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction) {
+
+    SpiQuery<T> spiQuery = (SpiQuery<T>)query;
+    int maxRows = spiQuery.getMaxRows();
+    if (maxRows == 0) {
+      throw new PersistenceException("maxRows must be specified for findPagedList() query");
+    }
+
+    return new LimitOffsetPagedList<T>(this, spiQuery);
+  }
+
   public <T> void findEach(Query<T> query, QueryEachConsumer<T> consumer, Transaction t) {
 
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, t);
@@ -1449,17 +1470,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     // no findId() method for SqlQuery...
     // a query that is expected to return either 0 or 1 rows
     List<SqlRow> list = findList(query, t);
-
-    if (list.size() == 0) {
-      return null;
-
-    } else if (list.size() > 1) {
-      String m = "Unique expecting 0 or 1 rows but got [" + list.size() + "]";
-      throw new PersistenceException(m);
-
-    } else {
-      return list.get(0);
-    }
+    return extractUnique(list);
   }
 
   public SqlFutureList findFutureList(SqlQuery query, Transaction t) {

src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java

@@ -357,6 +357,6 @@ public class InternalConfiguration {
   }
 
   public GeneratedPropertyFactory getGeneratedPropertyFactory() {
-    return new GeneratedPropertyFactory(serverConfig.getCurrentUserProvider());
+    return new GeneratedPropertyFactory(serverConfig);
   }
 }

src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java

@@ -21,6 +21,7 @@ import com.avaje.ebeaninternal.server.persist.PersistExecute;
 import com.avaje.ebeaninternal.server.transaction.BeanPersistIdMap;
 
 import javax.persistence.OptimisticLockException;
+import javax.persistence.PersistenceException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -150,12 +151,29 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     }
     this.concurrencyMode = beanDescriptor.getConcurrencyMode(intercept);
     this.publish = publish;
-    if (!publish && beanDescriptor.isDraftable()) {
+    if (isMarkDraftDirty(publish)) {
       beanDescriptor.setDraftDirty(entityBean, true);
     }
     this.dirty = intercept.isDirty();
   }
 
+  /**
+   * Return true if the draftDirty property should be set to true for this request.
+   */
+  private boolean isMarkDraftDirty(boolean publish) {
+    return !publish && type != Type.DELETE && beanDescriptor.isDraftable();
+  }
+
+  /**
+   * Set the transaction from prior persist request.
+   * Only used when hard deleting draft & associated live beans.
+   */
+  public void setTrans(SpiTransaction transaction) {
+    this.transaction = transaction;
+    this.createdTransaction = false;
+    this.persistCascade = transaction.isPersistCascade();
+  }
+
   /**
    * Init the transaction and also check for batch on cascade escalation.
    */
@@ -436,6 +454,31 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     return beanDescriptor.isDraftable();
   }
 
+  /**
+   * Return true if this request is a hard delete of a draftable bean.
+   * If this is true Ebean is expected to auto-publish and delete the associated live bean.
+   */
+  public boolean isHardDeleteDraft() {
+    if (type == Type.DELETE && beanDescriptor.isDraftable() && !beanDescriptor.isDraftableElement()) {
+      // deleting a top level draftable bean
+      if (beanDescriptor.isLiveInstance(entityBean)) {
+        throw new PersistenceException("Explicit Delete is not allowed on a 'live' bean - only draft beans");
+      }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Checks for @Draftable entity beans with @Draft property that the bean is a 'draft'.
+   * Save or Update is not allowed to execute using 'live' beans - must use publish().
+   */
+  public void checkDraft() {
+    if (beanDescriptor.isDraftable() && beanDescriptor.isLiveInstance(entityBean)) {
+      throw new PersistenceException("Save or update is not allowed on a 'live' bean - only draft beans");
+    }
+  }
+
   /**
    * Return the parent bean for cascading save with unidirectional relationship.
    */
@@ -711,6 +754,9 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
       intercept.setLoadedProperty(i);
     }
     beanDescriptor.setEmbeddedOwner(entityBean);
+    if (!publish) {
+      beanDescriptor.setDraft(entityBean);
+    }
   }
 
   public boolean isReference() {
@@ -827,4 +873,5 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   public boolean isSoftDelete() {
     return Type.SOFT_DELETE == type;
   }
+
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -12,6 +12,7 @@ import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.bean.EntityBeanIntercept;
 import com.avaje.ebean.bean.PersistenceContext;
 import com.avaje.ebean.config.EncryptKey;
+import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.IdGenerator;
 import com.avaje.ebean.config.dbplatform.IdType;
 import com.avaje.ebean.event.BeanFindController;
@@ -154,6 +155,11 @@ public class BeanDescriptor<T> implements MetaBeanInfo, SpiBeanType<T> {
 
   private final String draftTable;
 
+  /**
+   * DB table comment.
+   */
+  private final String dbComment;
+
   /**
    * Set to true if read auditing is on for this bean type.
    */
@@ -163,6 +169,8 @@ public class BeanDescriptor<T> implements MetaBeanInfo, SpiBeanType<T> {
 
   private final boolean draftableElement;
 
+  private final BeanProperty draft;
+
   private final BeanProperty draftDirty;
 
   /**
@@ -394,6 +402,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, SpiBeanType<T> {
     this.baseTable = InternString.intern(deploy.getBaseTable());
     this.baseTableAsOf = deploy.getBaseTableAsOf();
     this.baseTableVersionsBetween = deploy.getBaseTableVersionsBetween();
+    this.dbComment = deploy.getDbComment();
     this.autoTunable = EntityType.ORM.equals(entityType) && (beanFinder == null);
 
     // helper object used to derive lists of properties
@@ -403,6 +412,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, SpiBeanType<T> {
     this.softDelete = (softDeleteProperty != null);
     this.idProperty = listHelper.getId();
     this.versionProperty = listHelper.getVersionProperty();
+    this.draft = listHelper.getDraft();
     this.draftDirty = listHelper.getDraftDirty();
     this.propMap = listHelper.getPropertyMap();
     this.propertiesTransient = listHelper.getTransients();
@@ -506,6 +516,13 @@ public class BeanDescriptor<T> implements MetaBeanInfo, SpiBeanType<T> {
     }
   }
 
+  /**
+   * Return the ServerConfig.
+   */
+  public ServerConfig getServerConfig() {
+    return owner.getServerConfig();
+  }
+
   /**
    * Set the server. Primarily so that the Many's can lazy load.
    */
@@ -1925,6 +1942,13 @@ public class BeanDescriptor<T> implements MetaBeanInfo, SpiBeanType<T> {
     return EntityType.SQL.equals(entityType);
   }
 
+  /**
+   * Return the DB comment for the base table.
+   */
+  public String getDbComment() {
+    return dbComment;
+  }
+
   /**
    * Return the base table. Only properties mapped to the base table are by
    * default persisted.
@@ -1989,6 +2013,38 @@ public class BeanDescriptor<T> implements MetaBeanInfo, SpiBeanType<T> {
     return draftableElement;
   }
 
+  /**
+   * Set the draft to true for this entity bean instance.
+   * This bean is being loaded via asDraft() query.
+   */
+  public void setDraft(EntityBean entityBean) {
+    if (draft != null) {
+      draft.setValue(entityBean, true);
+    }
+  }
+
+  /**
+   * Return true if the bean is considered a 'draft' instance (not 'live').
+   */
+  public boolean isDraftInstance(EntityBean entityBean) {
+    if (draft != null) {
+      return Boolean.TRUE == draft.getValue(entityBean);
+    }
+    // no draft property - so return false
+    return false;
+  }
+
+  /**
+   * Return true if the bean is draftable and considered a 'live' instance.
+   */
+  public boolean isLiveInstance(EntityBean entityBean) {
+    if (draft != null) {
+      return Boolean.FALSE == draft.getValue(entityBean);
+    }
+    // no draft property - so return false
+    return false;
+  }
+
   /**
    * If there is a @DraftDirty property set it's value on the bean.
    */

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -125,6 +125,8 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
   private final String serverName;
 
+  private final ServerConfig serverConfig;
+
   private Map<Class<?>, DeployBeanInfo<?>> deplyInfoMap = new HashMap<Class<?>, DeployBeanInfo<?>>();
 
   private final Map<Class<?>, BeanTable> beanTableMap = new HashMap<Class<?>, BeanTable>();
@@ -178,8 +180,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    */
   public BeanDescriptorManager(InternalConfiguration config) {
 
-    ServerConfig serverConfig = config.getServerConfig();
-
+    this.serverConfig = config.getServerConfig();
     this.serverName = InternString.intern(serverConfig.getName());
     this.cacheManager = config.getCacheManager();
     this.xmlConfig = config.getXmlConfig();
@@ -240,6 +241,11 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return (historySupport == null ) ? serverConfig.getAsOfViewSuffix() : historySupport.getVersionsBetweenSuffix(serverConfig.getAsOfViewSuffix());
   }
 
+  @Override
+  public ServerConfig getServerConfig() {
+    return serverConfig;
+  }
+
   @SuppressWarnings("unchecked")
   public <T> BeanDescriptor<T> getBeanDescriptor(Class<T> entityType) {
     return (BeanDescriptor<T>) descMap.get(entityType.getName());

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorMap.java

@@ -2,6 +2,7 @@ package com.avaje.ebeaninternal.server.deploy;
 
 import com.avaje.ebean.cache.ServerCacheManager;
 import com.avaje.ebean.config.EncryptKey;
+import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebeaninternal.server.deploy.id.IdBinder;
 
 /**
@@ -12,26 +13,31 @@ import com.avaje.ebeaninternal.server.deploy.id.IdBinder;
  */
 public interface BeanDescriptorMap {
 
-    /**
-     * Return the name of the server/database.
-     */
-    String getServerName();
+  /**
+   * Return the name of the server/database.
+   */
+  String getServerName();
 
-    /**
-     * Return the Cache Manager.
-     */
-    ServerCacheManager getCacheManager();
+  /**
+   * Return the ServerConfig.
+   */
+  ServerConfig getServerConfig();
 
-    /**
-     * Return the BeanDescriptor for a given class.
-     */
-    <T> BeanDescriptor<T> getBeanDescriptor(Class<T> entityType);
+  /**
+   * Return the Cache Manager.
+   */
+  ServerCacheManager getCacheManager();
 
-    /**
-     * Return the Encrypt key given the table and column name.
-     */
-    EncryptKey getEncryptKey(String tableName, String columnName);
-    
-    IdBinder createIdBinder(BeanProperty id);
+  /**
+   * Return the BeanDescriptor for a given class.
+   */
+  <T> BeanDescriptor<T> getBeanDescriptor(Class<T> entityType);
+
+  /**
+   * Return the Encrypt key given the table and column name.
+   */
+  EncryptKey getEncryptKey(String tableName, String columnName);
+
+  IdBinder createIdBinder(BeanProperty id);
 
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java

@@ -211,6 +211,11 @@ public class BeanProperty implements ElPropertyValue {
    */
   final String dbColumnDefn;
 
+  /**
+   * Database DDL column comment.
+   */
+  final String dbComment;
+
   /**
    * DB Constraint (typically check constraint on enum)
    */
@@ -224,6 +229,8 @@ public class BeanProperty implements ElPropertyValue {
 
   final boolean jsonDeserialize;
 
+  final boolean draft;
+
   final boolean draftOnly;
 
   final boolean draftDirty;
@@ -262,6 +269,7 @@ public class BeanProperty implements ElPropertyValue {
     this.dbInsertable = deploy.isDbInsertable();
     this.dbUpdatable = deploy.isDbUpdateable();
     this.excludedFromHistory = deploy.isExcludedFromHistory();
+    this.draft = deploy.isDraft();
     this.draftDirty = deploy.isDraftDirty();
     this.draftOnly = deploy.isDraftOnly();
     this.draftReset = deploy.isDraftReset();
@@ -295,6 +303,7 @@ public class BeanProperty implements ElPropertyValue {
     this.setter = deploy.getSetter();
 
     this.dbColumn = tableAliasIntern(descriptor, deploy.getDbColumn(), false, null);
+    this.dbComment = deploy.getDbComment();
     this.sqlFormulaJoin = InternString.intern(deploy.getSqlFormulaJoin());
     this.sqlFormulaSelect = InternString.intern(deploy.getSqlFormulaSelect());
     this.formula = sqlFormulaSelect != null;
@@ -312,7 +321,7 @@ public class BeanProperty implements ElPropertyValue {
     if (softDelete) {
       ScalarTypeBoolean.BooleanBase boolType = (ScalarTypeBoolean.BooleanBase)scalarType;
       this.softDeleteDbSet = dbColumn+"="+boolType.getDbTrueLiteral();
-      this.softDeleteDbPredicate = dbColumn+"="+boolType.getDbFalseLiteral();
+      this.softDeleteDbPredicate = "."+dbColumn+","+boolType.getDbFalseLiteral()+")="+boolType.getDbFalseLiteral();
     } else {
       this.softDeleteDbSet = null;
       this.softDeleteDbPredicate = null;
@@ -358,6 +367,7 @@ public class BeanProperty implements ElPropertyValue {
     this.formula = false;
 
     this.excludedFromHistory = source.excludedFromHistory;
+    this.draft = source.draft;
     this.draftDirty = source.draftDirty;
     this.draftOnly = source.draftOnly;
     this.draftReset = source.draftReset;
@@ -373,6 +383,7 @@ public class BeanProperty implements ElPropertyValue {
     this.secondaryTableJoin = source.secondaryTableJoin;
     this.secondaryTableJoinPrefix = source.secondaryTableJoinPrefix;
 
+    this.dbComment = source.dbComment;
     this.dbBind = source.getDbBind();
     this.dbEncrypted = source.isDbEncrypted();
     this.dbEncryptedType = source.getDbEncryptedType();
@@ -646,7 +657,8 @@ public class BeanProperty implements ElPropertyValue {
    * Return the DB literal predicate used to filter out soft deleted rows from a query.
    */
   public String getSoftDeleteDbPredicate(String tableAlias) {
-    return tableAlias+"."+softDeleteDbPredicate;
+    // use coalesce to handle null values from optional relationships
+    return "coalesce(" + tableAlias + softDeleteDbPredicate;
   }
 
   /**
@@ -994,6 +1006,13 @@ public class BeanProperty implements ElPropertyValue {
     return dbColumn;
   }
 
+  /**
+   * Return the comment for the associated DB column.
+   */
+  public String getDbComment() {
+    return dbComment;
+  }
+
   /**
    * Return the database jdbc data type this is mapped to.
    */
@@ -1083,6 +1102,14 @@ public class BeanProperty implements ElPropertyValue {
     return draftOnly;
   }
 
+  /**
+   * Return true if this property is a boolean flag on a draftable bean
+   * indicating if the instance is a draft or live bean.
+   */
+  public boolean isDraft() {
+    return draft;
+  }
+
   /**
    * Return true if this property is a boolean flag only on the draft table
    * indicating that when the draft is different from the published row.

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java

@@ -31,7 +31,8 @@ public class BeanPropertyAssocManyJsonHelp {
    */
   public BeanPropertyAssocManyJsonHelp(BeanPropertyAssocMany<?> many) {
     this.many = many;
-    this.jsonTransient = !ClassUtil.isJacksonObjectMapperPresent() ? null : new BeanPropertyAssocManyJsonTransient();
+    boolean objectMapperPresent = many.getBeanDescriptor().getServerConfig().getClassLoadConfig().isJacksonObjectMapperPresent();
+    this.jsonTransient = !objectMapperPresent ? null : new BeanPropertyAssocManyJsonTransient();
   }
 
   /**

src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java

@@ -3,7 +3,9 @@ package com.avaje.ebeaninternal.server.deploy.generatedproperty;
 import java.math.BigDecimal;
 import java.util.HashSet;
 
+import com.avaje.ebean.config.ClassLoadConfig;
 import com.avaje.ebean.config.CurrentUserProvider;
+import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 /**
@@ -13,9 +15,9 @@ public class GeneratedPropertyFactory {
 
 	private final CounterFactory counterFactory = new CounterFactory();
 
-  private final InsertTimestampFactory insertFactory = new InsertTimestampFactory();
+  private final InsertTimestampFactory insertFactory;
 
-  private final UpdateTimestampFactory updateFactory = new UpdateTimestampFactory();
+  private final UpdateTimestampFactory updateFactory;
 
   private final HashSet<String> numberTypes = new HashSet<String>();
 
@@ -23,8 +25,15 @@ public class GeneratedPropertyFactory {
 
   private final GeneratedWhoCreated generatedWhoCreated;
 
-  public GeneratedPropertyFactory(CurrentUserProvider currentUserProvider) {
+  private final ClassLoadConfig classLoadConfig;
 
+  public GeneratedPropertyFactory(ServerConfig serverConfig) {
+
+    this.classLoadConfig = serverConfig.getClassLoadConfig();
+    this.insertFactory = new InsertTimestampFactory(classLoadConfig);
+    this.updateFactory = new UpdateTimestampFactory(classLoadConfig);
+
+    CurrentUserProvider currentUserProvider = serverConfig.getCurrentUserProvider();
 	  if (currentUserProvider != null) {
       generatedWhoCreated = new GeneratedWhoCreated(currentUserProvider);
       generatedWhoModified = new GeneratedWhoModified(currentUserProvider);
@@ -44,7 +53,11 @@ public class GeneratedPropertyFactory {
 		numberTypes.add(BigDecimal.class.getName());
 	}
 
-	private boolean isNumberType(String typeClassName) {
+  public ClassLoadConfig getClassLoadConfig() {
+    return classLoadConfig;
+  }
+
+  private boolean isNumberType(String typeClassName) {
 		return numberTypes.contains(typeClassName);
 	}
 	

src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java

@@ -9,7 +9,7 @@ import java.util.Map;
 
 import javax.persistence.PersistenceException;
 
-import com.avaje.ebeaninternal.api.ClassUtil;
+import com.avaje.ebean.config.ClassLoadConfig;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 /**
@@ -21,25 +21,25 @@ public class InsertTimestampFactory {
 
   final Map<Class<?>, GeneratedProperty> map = new HashMap<Class<?>, GeneratedProperty>();
 
-  public InsertTimestampFactory() {
+  public InsertTimestampFactory(ClassLoadConfig classLoadConfig) {
     map.put(Timestamp.class, new GeneratedInsertTimestamp());
     map.put(java.util.Date.class, new GeneratedInsertDate());
     map.put(Long.class, longTime);
     map.put(long.class, longTime);
 
-    if (ClassUtil.isPresent("java.time.LocalDate", this.getClass())) {
+    if (classLoadConfig.isJavaTimePresent()) {
       map.put(LocalDateTime.class, new GeneratedInsertJavaTime.LocalDT());
       map.put(OffsetDateTime.class, new GeneratedInsertJavaTime.OffsetDT());
       map.put(ZonedDateTime.class, new GeneratedInsertJavaTime.ZonedDT());
     }
-    if (ClassUtil.isPresent("org.joda.time.LocalDateTime", this.getClass())) {
+    if (classLoadConfig.isJodaTimePresent()) {
       map.put(org.joda.time.LocalDateTime.class, new GeneratedInsertJodaTime.LocalDT());
       map.put(org.joda.time.DateTime.class, new GeneratedInsertJodaTime.DateTimeDT());
     }
 
   }
 
-	public void setInsertTimestamp(DeployBeanProperty property) {
+  public void setInsertTimestamp(DeployBeanProperty property) {
 
 		property.setGeneratedProperty(createInsertTimestamp(property));
 	}

src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java

@@ -9,7 +9,7 @@ import java.util.Map;
 
 import javax.persistence.PersistenceException;
 
-import com.avaje.ebeaninternal.api.ClassUtil;
+import com.avaje.ebean.config.ClassLoadConfig;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 /**
@@ -21,18 +21,18 @@ public class UpdateTimestampFactory {
 
   final Map<Class<?>, GeneratedProperty> map = new HashMap<Class<?>, GeneratedProperty>();
 
-  public UpdateTimestampFactory() {
+  public UpdateTimestampFactory(ClassLoadConfig classLoadConfig) {
     map.put(Timestamp.class, new GeneratedUpdateTimestamp());
     map.put(java.util.Date.class, new GeneratedUpdateDate());
     map.put(Long.class, longTime);
     map.put(long.class, longTime);
 
-    if (ClassUtil.isPresent("java.time.LocalDate", this.getClass())) {
+    if (classLoadConfig.isJavaTimePresent()) {
       map.put(LocalDateTime.class, new GeneratedUpdateJavaTime.LocalDT());
       map.put(OffsetDateTime.class, new GeneratedUpdateJavaTime.OffsetDT());
       map.put(ZonedDateTime.class, new GeneratedUpdateJavaTime.ZonedDT());
     }
-    if (ClassUtil.isPresent("org.joda.time.LocalDateTime", this.getClass())) {
+    if (classLoadConfig.isJodaTimePresent()) {
       map.put(org.joda.time.LocalDateTime.class, new GeneratedUpdateJodaTime.LocalDT());
       map.put(org.joda.time.DateTime.class, new GeneratedUpdateJodaTime.DateTimeDT());
     }

src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java

@@ -165,6 +165,9 @@ public class DeployBeanDescriptor<T> {
 
   private ChangeLogFilter changeLogFilter;
 
+  private String dbComment;
+
+
   /**
    * Construct the BeanDescriptor.
    */
@@ -207,6 +210,14 @@ public class DeployBeanDescriptor<T> {
     return readAuditing;
   }
 
+  public void setDbComment(String dbComment) {
+    this.dbComment = dbComment;
+  }
+
+  public String getDbComment() {
+    return dbComment;
+  }
+
   public void setDraftable() {
     draftable = true;
   }

src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java

@@ -186,12 +186,15 @@ public class DeployBeanProperty {
 
   private boolean excludedFromHistory;
 
+  private boolean draft;
   private boolean draftOnly;
   private boolean draftDirty;
   private boolean draftReset;
 
   private boolean softDelete;
 
+  private String dbComment;
+
   public DeployBeanProperty(DeployBeanDescriptor<?> desc, Class<?> propertyType, ScalarType<?> scalarType, ScalarTypeConverter<?, ?> typeConverter) {
     this.desc = desc;
     this.propertyType = propertyType;
@@ -657,6 +660,7 @@ public class DeployBeanProperty {
         return false;
     }
   }
+
   /**
    * Return true if this property is based on a secondary table.
    */
@@ -853,6 +857,15 @@ public class DeployBeanProperty {
     this.excludedFromHistory = true;
   }
 
+  public void setDraft() {
+    this.draft = true;
+    this.isTransient = true;
+  }
+
+  public boolean isDraft() {
+    return draft;
+  }
+
   public void setDraftOnly() {
     this.draftOnly = true;
   }
@@ -864,6 +877,7 @@ public class DeployBeanProperty {
   public void setDraftDirty() {
     this.draftOnly = true;
     this.draftDirty = true;
+    this.nullable = false;
   }
 
   public boolean isDraftDirty() {
@@ -880,10 +894,18 @@ public class DeployBeanProperty {
 
   public void setSoftDelete() {
     this.softDelete = true;
+    this.nullable = false;
   }
 
   public boolean isSoftDelete() {
     return softDelete;
   }
 
+  public void setDbComment(String dbComment) {
+    this.dbComment = dbComment;
+  }
+
+  public String getDbComment() {
+    return dbComment;
+  }
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java

@@ -28,6 +28,8 @@ public class DeployBeanPropertyLists {
 
   private BeanProperty versionProperty;
 
+  private BeanProperty draft;
+
   private BeanProperty draftDirty;
 
   private final BeanDescriptor<?> desc;
@@ -136,6 +138,9 @@ public class DeployBeanPropertyLists {
   private void allocateToList(BeanProperty prop) {
     if (prop.isTransient()) {
       transients.add(prop);
+      if (prop.isDraft()) {
+        draft = prop;
+      }
       return;
     }
     if (prop.isId()) {
@@ -293,6 +298,10 @@ public class DeployBeanPropertyLists {
     return draftDirty;
   }
 
+  public BeanProperty getDraft() {
+    return draft;
+  }
+
   public BeanProperty getSoftDeleteProperty() {
 
     for (BeanProperty prop: nonManys) {

src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationClass.java

@@ -1,5 +1,7 @@
 package com.avaje.ebeaninternal.server.deploy.parse;
 
+import javax.persistence.AttributeOverride;
+import javax.persistence.Column;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.NamedQueries;
@@ -9,6 +11,7 @@ import javax.persistence.UniqueConstraint;
 
 import com.avaje.ebean.annotation.CacheStrategy;
 import com.avaje.ebean.annotation.CacheTuning;
+import com.avaje.ebean.annotation.DbComment;
 import com.avaje.ebean.annotation.Draftable;
 import com.avaje.ebean.annotation.DraftableElement;
 import com.avaje.ebean.annotation.EntityConcurrencyMode;
@@ -25,22 +28,60 @@ import com.avaje.ebeaninternal.server.deploy.CompoundUniqueConstraint;
 import com.avaje.ebeaninternal.server.deploy.DeployNamedQuery;
 import com.avaje.ebeaninternal.server.deploy.DeployNamedUpdate;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Read the class level deployment annotations.
  */
 public class AnnotationClass extends AnnotationParser {
 
+  private static final Logger logger = LoggerFactory.getLogger(AnnotationClass.class);
+
   private final String asOfViewSuffix;
 
   private final String versionsBetweenSuffix;
 
+  /**
+   * Create for normal early parse of class level annotations.
+   */
   public AnnotationClass(DeployBeanInfo<?> info, boolean validationAnnotations, String asOfViewSuffix, String versionsBetweenSuffix) {
     super(info, validationAnnotations);
     this.asOfViewSuffix = asOfViewSuffix;
     this.versionsBetweenSuffix = versionsBetweenSuffix;
   }
 
+  /**
+   * Create to parse AttributeOverride annotations which is run last
+   * after all the properties/fields have been parsed fully.
+   */
+  public AnnotationClass(DeployBeanInfo<?> info) {
+    super(info, false);
+    this.asOfViewSuffix = null;
+    this.versionsBetweenSuffix = null;
+  }
+
+  /**
+   * Parse any AttributeOverride set on the class.
+   */
+  public void parseAttributeOverride() {
+
+    Class<?> cls = descriptor.getBeanType();
+    AttributeOverride override = cls.getAnnotation(AttributeOverride.class);
+    if (override != null) {
+      String propertyName = override.name();
+      Column column = override.column();
+      if (column != null) {
+        DeployBeanProperty beanProperty = descriptor.getBeanProperty(propertyName);
+        if (beanProperty == null) {
+          logger.error("AttributeOverride property [" + propertyName + "] not found on " + descriptor.getFullName());
+        } else {
+          readColumn(column, beanProperty);
+        }
+      }
+    }
+  }
+
   /**
    * Read the class level deployment annotations.
    */
@@ -120,6 +161,11 @@ public class AnnotationClass extends AnnotationParser {
       descriptor.setHistorySupport();
     }
 
+    DbComment comment = cls.getAnnotation(DbComment.class);
+    if (comment != null) {
+      descriptor.setDbComment(comment.value());
+    }
+
     UpdateMode updateMode = cls.getAnnotation(UpdateMode.class);
     if (updateMode != null) {
       descriptor.setUpdateChangesOnly(updateMode.updateChangesOnly());

src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java

@@ -149,6 +149,9 @@ public class AnnotationFields extends AnnotationParser {
       util.setLobType(prop);
     }
 
+    if (get(prop, Draft.class) != null) {
+      prop.setDraft();
+    }
     if (get(prop, DraftOnly.class) != null) {
       prop.setDraftOnly();
     }
@@ -163,6 +166,10 @@ public class AnnotationFields extends AnnotationParser {
       prop.setSoftDelete();
     }
 
+    DbComment comment = get(prop, DbComment.class);
+    if (comment != null) {
+      prop.setDbComment(comment.value());
+    }
     DbJson dbJson = get(prop, DbJson.class);
     if (dbJson != null) {
       util.setDbJsonType(prop, dbJson);
@@ -453,32 +460,5 @@ public class AnnotationFields extends AnnotationParser {
     }
   }
 
-  private void readColumn(Column columnAnn, DeployBeanProperty prop) {
-
-    if (!isEmpty(columnAnn.name())) {
-      String dbColumn = databasePlatform.convertQuotedIdentifiers(columnAnn.name());
-      prop.setDbColumn(dbColumn);
-    }
-
-    prop.setDbInsertable(columnAnn.insertable());
-    prop.setDbUpdateable(columnAnn.updatable());
-    prop.setNullable(columnAnn.nullable());
-    prop.setUnique(columnAnn.unique());
-    if (columnAnn.precision() > 0) {
-      prop.setDbLength(columnAnn.precision());
-    } else if (columnAnn.length() != 255) {
-      // set default 255 on DbTypeMap
-      prop.setDbLength(columnAnn.length());
-    }
-    prop.setDbScale(columnAnn.scale());
-    prop.setDbColumnDefn(columnAnn.columnDefinition());
-
-    String baseTable = descriptor.getBaseTable();
-    String tableName = columnAnn.table();
-    if (!"".equals(tableName) && !tableName.equalsIgnoreCase(baseTable)) {
-      // its on a secondary table...
-      prop.setSecondaryTable(tableName);
-    }
-  }
 
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java

@@ -5,9 +5,11 @@ import java.util.HashMap;
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
 
 import com.avaje.ebeaninternal.server.deploy.BeanCascadeInfo;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
+import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 
 /**
@@ -66,4 +68,31 @@ public abstract class AnnotationParser extends AnnotationBase {
 
   }
 
+  protected void readColumn(Column columnAnn, DeployBeanProperty prop) {
+
+    if (!isEmpty(columnAnn.name())) {
+      String dbColumn = databasePlatform.convertQuotedIdentifiers(columnAnn.name());
+      prop.setDbColumn(dbColumn);
+    }
+
+    prop.setDbInsertable(columnAnn.insertable());
+    prop.setDbUpdateable(columnAnn.updatable());
+    prop.setNullable(columnAnn.nullable());
+    prop.setUnique(columnAnn.unique());
+    if (columnAnn.precision() > 0) {
+      prop.setDbLength(columnAnn.precision());
+    } else if (columnAnn.length() != 255) {
+      // set default 255 on DbTypeMap
+      prop.setDbLength(columnAnn.length());
+    }
+    prop.setDbScale(columnAnn.scale());
+    prop.setDbColumnDefn(columnAnn.columnDefinition());
+
+    String baseTable = descriptor.getBaseTable();
+    String tableName = columnAnn.table();
+    if (!"".equals(tableName) && !tableName.equalsIgnoreCase(baseTable)) {
+      // its on a secondary table...
+      prop.setSecondaryTable(tableName);
+    }
+  }
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/parse/ReadAnnotations.java

@@ -1,6 +1,5 @@
 package com.avaje.ebeaninternal.server.deploy.parse;
 
-import com.avaje.ebeaninternal.api.ClassUtil;
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager;
 import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
 
@@ -37,8 +36,8 @@ public class ReadAnnotations {
     this.generatedPropFactory = generatedPropFactory;
     this.asOfViewSuffix = asOfViewSuffix;
     this.versionsBetweenSuffix = versionsBetweenSuffix;
-    this.javaxValidationAnnotations = ClassUtil.isJavaxValidationAnnotationsPresent();
-    this.jacksonAnnotations = ClassUtil.isJacksonAnnotationsPresent();
+    this.javaxValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJavaxValidationAnnotationsPresent();
+    this.jacksonAnnotations = generatedPropFactory.getClassLoadConfig().isJacksonAnnotationsPresent();
   }
 
   /**
@@ -80,6 +79,8 @@ public class ReadAnnotations {
       // dependent on field level annotations
       new AnnotationSql(info, javaxValidationAnnotations).parse();
 
+      new AnnotationClass(info).parseAttributeOverride();
+
     } catch (RuntimeException e) {
       throw new RuntimeException("Error reading annotations for " + info, e);
     }

src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java

@@ -1,13 +1,13 @@
 package com.avaje.ebeaninternal.server.expression;
 
-import java.util.Collection;
-
 import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.event.BeanQueryRequest;
 import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
 import com.avaje.ebeaninternal.api.SpiExpressionRequest;
 import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 
+import java.util.Collection;
+
 class InExpression extends AbstractExpression {
 
   private static final long serialVersionUID = 3150665801693551260L;
@@ -54,10 +54,8 @@ class InExpression extends AbstractExpression {
   public void addSql(SpiExpressionRequest request) {
 
     if (values.length == 0) {
-      if (!not) {
-        // 'no match' for in empty collection
-        request.append("1=0");
-      }
+      String expr = not ? "1=1" : "1=0";
+      request.append(expr);
       return;
     }
 

src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java

@@ -314,6 +314,11 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
     return exprList.findPagedList(pageIndex, pageSize);
   }
 
+  @Override
+  public PagedList<T> findPagedList() {
+    return exprList.findPagedList();
+  }
+
   @Override
   public int findRowCount() {
     return exprList.findRowCount();
@@ -567,7 +572,7 @@ abstract class JunctionExpression<T> implements Junction<T>, SpiExpression, Expr
   }
 
   @Override
-  public ExpressionList<T> raw(String raw, Object[] values) {
+  public ExpressionList<T> raw(String raw, Object... values) {
     return exprList.raw(raw, values);
   }
 

src/main/java/com/avaje/ebeaninternal/server/lib/sql/DataSourcePool.java

@@ -171,10 +171,14 @@ public class DataSourcePool implements DataSource {
   private final Runnable heartbeatRunnable = new HeartBeatRunnable();
 
   public DataSourcePool(DataSourceAlert notify, String name, DataSourceConfig params) {
+    this(notify, name, params, null);
+  }
+
+  public DataSourcePool(DataSourceAlert notify, String name, DataSourceConfig params, DataSourcePoolListener listener) {
 
     this.notify = notify;
     this.name = name;
-    this.poolListener = createPoolListener(params.getPoolListener());
+    this.poolListener = listener;
 
     this.autoCommit = params.isAutoCommit();
     this.transactionIsolation = params.getIsolationLevel();
@@ -238,30 +242,8 @@ public class DataSourcePool implements DataSource {
     throw new SQLFeatureNotSupportedException("We do not support java.util.logging");
   }
 
-  /**
-   * Create the DataSourcePoolListener if there is one.
-   */
-  private DataSourcePoolListener createPoolListener(String cn) {
-    if (cn == null) {
-      return null;
-    }
-    try {
-      return (DataSourcePoolListener) ClassUtil.newInstance(cn, this.getClass());
-    } catch (Exception e) {
-      throw new IllegalArgumentException(e);
-    }
-  }
-
   private void initialise() throws SQLException {
 
-    // Ensure database driver is loaded
-    try {
-      ClassUtil.forName(this.databaseDriver, this.getClass());
-    } catch (Throwable e) {
-      throw new PersistenceException("Problem loading Database Driver [" + this.databaseDriver + "]: "
-          + e.getMessage(), e);
-    }
-
     String transIsolation = TransactionIsolation.getLevelDescription(transactionIsolation);
     //noinspection StringBufferReplaceableByString
     StringBuilder sb = new StringBuilder(70);

src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java

@@ -354,6 +354,7 @@ public final class DefaultPersister implements Persister {
 
     PersistRequestBean<?> req = createRequest(entityBean, t, PersistRequest.Type.UPDATE);
     req.setDeleteMissingChildren(deleteMissingChildren);
+    req.checkDraft();
     try {
       req.initTransIfRequiredWithBatchCascade();
       if (req.isReference()) {
@@ -501,21 +502,31 @@ public final class DefaultPersister implements Persister {
   public boolean delete(EntityBean bean, Transaction t, boolean permanent) {
 
     Type deleteType = permanent ? Type.DELETE_PERMANENT : Type.DELETE;
-    PersistRequestBean<EntityBean> request = createRequest(bean, t, deleteType);
-    boolean deleted = deleteRequest(request);
+    PersistRequestBean<EntityBean> originalRequest = createRequest(bean, t, deleteType);
 
-    if (request.isDraftable() && request.getType() == Type.DELETE) {
-      // we have just deleting a draft bean so now we need to delete the
-      // associated 'live' bean. This is effectively an 'automatic publish'.
-      deleteRequest(createPublishRequest(request.createReference(), t, Type.DELETE_PERMANENT, true));
+    if (originalRequest.isHardDeleteDraft()) {
+      // a hard delete of a draftable bean so first we need to  delete the associated 'live' bean
+      // due to FK constraint and then after that execute the original delete of the draft bean
+      return deleteRequest(createPublishRequest(originalRequest.createReference(), t, Type.DELETE_PERMANENT, true), originalRequest);
+
+    } else {
+      // normal delete or soft delete
+      return deleteRequest(originalRequest);
     }
-    return deleted;
   }
 
   /**
    * Execute the delete request returning true if a delete occurred.
    */
   private boolean deleteRequest(PersistRequestBean<?> req) {
+    return deleteRequest(req, null);
+  }
+
+  /**
+   * Execute the delete request support a second delete request for live and draft permanent delete.
+   * A common transaction is used across both requests.
+   */
+  private boolean deleteRequest(PersistRequestBean<?> req, PersistRequestBean<?> draftReq) {
 
     if (req.isRegisteredForDeleteBean()) {
       // skip deleting bean. Used where cascade is on
@@ -529,6 +540,11 @@ public final class DefaultPersister implements Persister {
     try {
       req.initTransIfRequiredWithBatchCascade();
       boolean deleted = delete(req);
+      if (draftReq != null) {
+        // delete the 'draft' bean ('live' bean deleted first)
+        draftReq.setTrans(req.getTransaction());
+        deleted = delete(draftReq);
+      }
       req.commitTransIfRequired();
       req.flushBatchOnCascade();
 

src/main/java/com/avaje/ebeaninternal/server/persist/dml/InsertMeta.java

@@ -84,7 +84,7 @@ public final class InsertMeta {
         this.selectLastInsertedId = desc.getSelectLastInsertedId();
       }
       this.sqlNullId = genSql(true, tableName, false);
-      this.sqlDraftNullId = desc.isDraftable() ? genSql(false, draftTableName, true) : sqlNullId;
+      this.sqlDraftNullId = desc.isDraftable() ? genSql(true, draftTableName, true) : sqlNullId;
     }
   }
 

src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java

@@ -21,7 +21,9 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   private final SpiQuery<T> query;
 
-  private final int pageSize;
+  private final int firstRow;
+
+  private final int maxRows;
 
   private final int pageIndex;
 
@@ -33,11 +35,29 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   private List<T> list;
 
+  /**
+   * Construct with pageIndex/pageSize.
+   */
   public LimitOffsetPagedList(EbeanServer server, SpiQuery<T> query, int pageIndex, int pageSize) {
     this.server = server;
     this.query = query;
-    this.pageSize = pageSize;
+    this.maxRows = pageSize;
+    this.firstRow = pageIndex * pageSize;
     this.pageIndex = pageIndex;
+
+    query.setFirstRow(firstRow);
+    query.setMaxRows(pageSize);
+  }
+
+  /**
+   * Construct with firstRow/maxRows.
+   */
+  public LimitOffsetPagedList(EbeanServer server, SpiQuery<T> query) {
+    this.server = server;
+    this.query = query;
+    this.maxRows = query.getMaxRows();
+    this.firstRow = query.getFirstRow();
+    this.pageIndex = 0;
   }
 
   public void loadRowCount() {
@@ -56,8 +76,6 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
   public List<T> getList() {
     synchronized (monitor) {
       if (list == null) {
-        query.setFirstRow(pageIndex * pageSize);
-        query.setMaxRows(pageSize);
         list = server.findList(query, null);
       }
       return list;
@@ -70,7 +88,7 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
     if (rowCount == 0) {
       return 0;
     } else {
-      return ((rowCount - 1) / pageSize) + 1;
+      return ((rowCount - 1) / maxRows) + 1;
     }
   }
 
@@ -94,11 +112,11 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
   }
 
   public boolean hasNext() {
-    return pageIndex < (getTotalPageCount() - 1);
+    return (firstRow + maxRows) < getTotalRowCount();
   }
 
   public boolean hasPrev() {
-    return pageIndex > 0;
+    return firstRow > 0;
   }
 
   public int getPageIndex() {
@@ -106,13 +124,13 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
   }
 
   public int getPageSize() {
-    return pageSize;
+    return maxRows;
   }
 
   public String getDisplayXtoYofZ(String to, String of) {
 
-    int first = pageIndex * pageSize + 1;
-    int last = first + getList().size() - 1;
+    int first = firstRow + 1;
+    int last = firstRow + getList().size();
     int total = getTotalRowCount();
 
     return first + to + last + of + total;

src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java

@@ -301,6 +301,9 @@ public class SqlTreeNodeBean implements SqlTreeNode {
       if (readId && !temporalVersions) {
         createListProxies(localDesc, ctx, localBean);
       }
+      if (temporalMode == SpiQuery.TemporalMode.DRAFT) {
+        localDesc.setDraft(localBean);
+      }
       localDesc.postLoad(localBean);
 
       EntityBeanIntercept ebi = localBean._ebean_getIntercept();

src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -529,6 +529,9 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     if (detail != null) {
       copy.detail = detail.copy();
     }
+    if (temporalMode == TemporalMode.DRAFT) {
+      copy.temporalMode = TemporalMode.DRAFT;
+    }
 
     copy.firstRow = firstRow;
     copy.maxRows = maxRows;
@@ -1094,6 +1097,11 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.findPagedList(this, null, pageIndex, pageSize);
   }
 
+  @Override
+  public PagedList<T> findPagedList() {
+    return server.findPagedList(this, null);
+  }
+
   /**
    * Set an ordered bind parameter according to its position. Note that the position starts at 1 to
    * be consistent with JDBC PreparedStatement. You need to set a parameter value for each ? you

src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java

@@ -162,13 +162,13 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
     this.typeMap = new ConcurrentHashMap<Class<?>, ScalarType<?>>();
     this.nativeMap = new ConcurrentHashMap<Integer, ScalarType<?>>();
 
-    this.objectMapperPresent = ClassUtil.isJacksonObjectMapperPresent();
+    this.objectMapperPresent = config.getClassLoadConfig().isJacksonObjectMapperPresent();
 
     this.extraTypeFactory = new DefaultTypeFactory(config);
 
     initialiseStandard(jsonDateTime, config);
     initialiseJavaTimeTypes(jsonDateTime, config);
-    initialiseJodaTypes(jsonDateTime);
+    initialiseJodaTypes(jsonDateTime, config);
     initialiseJacksonTypes(config);
 
     if (isPostgres(config.getDatabasePlatform())) {
@@ -553,7 +553,7 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
       maxValueLen = Math.max(maxValueLen, value.length());
 
       Object enumValue = Enum.valueOf(enumType, name.trim());
-      beanDbMap.add(enumValue, value.trim());
+      beanDbMap.add(enumValue, value);
     }
 
     if (dbColumnLength == 0 && !integerType) {
@@ -738,7 +738,7 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
    */
   protected void initialiseJacksonTypes(ServerConfig config) {
 
-    if (ClassUtil.isPresent("com.fasterxml.jackson.databind.ObjectMapper", this.getClass())) {
+    if (config.getClassLoadConfig().isJacksonObjectMapperPresent()) {
 
       logger.trace("Registering JsonNode type support");
 
@@ -765,7 +765,7 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
   }
 
   protected void initialiseJavaTimeTypes(JsonConfig.DateTime mode, ServerConfig config) {
-    if (ClassUtil.isPresent("java.time.LocalDate", this.getClass())) {
+    if (config.getClassLoadConfig().isJavaTimePresent()) {
       logger.debug("Registering java.time data types");
       typeMap.put(java.time.LocalDate.class, new ScalarTypeLocalDate());
       typeMap.put(java.time.LocalDateTime.class, new ScalarTypeLocalDateTime(mode));
@@ -796,10 +796,10 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable {
    * Detect if Joda classes are in the classpath and if so register the Joda
    * data types.
    */
-  protected void initialiseJodaTypes(JsonConfig.DateTime mode) {
+  protected void initialiseJodaTypes(JsonConfig.DateTime mode, ServerConfig config) {
 
     // detect if Joda classes are in the classpath
-    if (ClassUtil.isPresent("org.joda.time.LocalDateTime", this.getClass())) {
+    if (config.getClassLoadConfig().isJodaTimePresent()) {
       // Joda classes are in the classpath so register the types
       logger.debug("Registering Joda data types");
       typeMap.put(LocalDateTime.class, new ScalarTypeJodaLocalDateTime(mode));

src/main/java/com/avaje/ebeaninternal/server/util/ClassPathSearch.java

@@ -75,7 +75,7 @@ public class ClassPathSearch implements ClassPathSearchService {
       if (classPathReaderCN != null) {
         // use a user defined classPathReader
         logger.info("Using [" + classPathReaderCN + "] to read the searchable class path");
-        classPathReader = (ClassPathReader) ClassUtil.newInstance(classPathReaderCN, this.getClass());
+        classPathReader = (ClassPathReader) ClassUtil.newInstance(classPathReaderCN);
       }
 
       Object[] rawClassPaths = classPathReader.readPath(classLoader);
@@ -466,7 +466,7 @@ public class ClassPathSearch implements ClassPathSearchService {
   }
 
   /**
-   * If a jarfile with a manifest claspath return that.
+   * If a jarfile with a manifest classpath return that.
    */
   private static List<URI> getClassPathFromManifest(File jarFile, Manifest manifest) {
 

src/main/java/com/avaje/ebeaninternal/util/DefaultExpressionList.java

@@ -201,6 +201,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.findPagedList(pageIndex, pageSize);
   }
 
+  @Override
+  public PagedList<T> findPagedList() {
+    return query.findPagedList();
+  }
+
   @Override
   public int findRowCount() {
     return query.findRowCount();
@@ -691,7 +696,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   }
 
   @Override
-  public ExpressionList<T> raw(String raw, Object[] values) {
+  public ExpressionList<T> raw(String raw, Object... values) {
     add(expr.raw(raw, values));
     return this;
   }

src/test/java/com/avaje/ebean/TestRawSqlBuilder.java

@@ -1,11 +1,13 @@
 package com.avaje.ebean;
 
-import org.junit.Assert;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import com.avaje.ebean.RawSql.Sql;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 public class TestRawSqlBuilder extends BaseTestCase {
 
@@ -17,8 +19,27 @@ public class TestRawSqlBuilder extends BaseTestCase {
     assertEquals("id", sql.getPreFrom());
     assertEquals("from t_cust", sql.getPreWhere());
     assertEquals("", sql.getPreHaving());
-    Assert.assertNull(sql.getOrderBy());
+    assertNull(sql.getOrderBy());
+  }
 
+  @Test
+  public void testWithNewLineCharacters() {
+
+    RawSqlBuilder r = RawSqlBuilder.parse("select\n id from\n o_customer");
+    Sql sql = r.getSql();
+
+    assertEquals("id", sql.getPreFrom());
+    assertEquals("from  o_customer", sql.getPreWhere());
+    assertEquals("", sql.getPreHaving());
+    assertNull(sql.getOrderBy());
+
+    ResetBasicData.reset();
+
+    RawSql rawSql = r.create();
+
+    Ebean.find(Customer.class)
+        .setRawSql(rawSql)
+        .findList();
   }
 
   @Test
@@ -29,7 +50,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
     assertEquals("id", sql.getPreFrom());
     assertEquals("from t_cust where id > ?", sql.getPreWhere());
     assertEquals("", sql.getPreHaving());
-    Assert.assertNull(sql.getOrderBy());
+    assertNull(sql.getOrderBy());
   }
 
   @Test
@@ -87,7 +108,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
     assertEquals("id, sum(x)", sql.getPreFrom());
     assertEquals("from t_cust", sql.getPreWhere());
     assertEquals("group by id having sum(x) > ?", sql.getPreHaving());
-    Assert.assertNull(sql.getOrderBy());
+    assertNull(sql.getOrderBy());
     assertEquals("order by", sql.getOrderByPrefix());
 
     // no order by
@@ -97,7 +118,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
     assertEquals("id, sum(x)", sql.getPreFrom());
     assertEquals("from t_cust where id > ?", sql.getPreWhere());
     assertEquals("group by id having sum(x) > ?", sql.getPreHaving());
-    Assert.assertNull(sql.getOrderBy());
+    assertNull(sql.getOrderBy());
     assertEquals("order by", sql.getOrderByPrefix());
   }
 

src/test/java/com/avaje/ebean/TestRawSqlColumnParsing.java

@@ -89,7 +89,42 @@ public class TestRawSqlColumnParsing extends TestCase {
 
     }
 
-    
+    public void test_withDatabaseFunction() {
+
+        ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a a0,b    b1, MONTH(MAKEDATE(2015, 241)) m2 ,   d    d3  , e  e4 ");
+        Map<String, Column> mapping = columnMapping.mapping();
+
+        assertEquals(5, mapping.size());
+
+        Column c = mapping.get("a");
+
+        assertEquals("a",c.getDbColumn());
+        assertEquals(0, c.getIndexPos());
+        assertEquals("a0",c.getPropertyName());
+
+        c = mapping.get("b");
+        assertEquals("b",c.getDbColumn());
+        assertEquals(1, c.getIndexPos());
+        assertEquals("b1",c.getPropertyName());
+
+        c = mapping.get("MONTH(MAKEDATE(2015, 241))");
+        assertEquals("MONTH(MAKEDATE(2015, 241))",c.getDbColumn());
+        assertEquals(2, c.getIndexPos());
+        assertEquals("m2",c.getPropertyName());
+
+        c = mapping.get("d");
+        assertEquals("d",c.getDbColumn());
+        assertEquals(3, c.getIndexPos());
+        assertEquals("d3",c.getPropertyName());
+
+
+        c = mapping.get("e");
+        assertEquals("e",c.getDbColumn());
+        assertEquals(4, c.getIndexPos());
+        assertEquals("e4",c.getPropertyName());
+
+    }
+
     public void test_withAsAlias() {
         
         ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a as a0,'b'    b1, \"c(blah)\" as c2 ,   d as   d3  , e     as e4 ");

src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java

@@ -17,6 +17,6 @@ public class DbMigrationConfigTest {
 
     DbMigrationConfig migrationConfig = config.getMigrationConfig();
 
-    assertThat(migrationConfig.getResourcePath()).isEqualTo("dbmigration/myapp");
+    assertThat(migrationConfig.getMigrationPath()).isEqualTo("dbmigration/myapp");
   }
 }

src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java

@@ -1,5 +1,6 @@
 package com.avaje.ebean.config;
 
+import com.avaje.ebean.config.dbplatform.DbPlatformName;
 import org.junit.Test;
 
 import java.util.Properties;
@@ -17,6 +18,18 @@ public class PropertiesWrapperTest {
     assertEquals("myserver", pw.getServerName());
   }
 
+  @Test
+  public void testGetEnum() {
+
+    Properties properties = new Properties();
+    properties.put("platform","postgres");
+
+    PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", properties);
+    assertEquals(DbPlatformName.POSTGRES, pw.getEnum(DbPlatformName.class, "platform", DbPlatformName.H2));
+    assertEquals(DbPlatformName.H2, pw.getEnum(DbPlatformName.class, "junk", DbPlatformName.H2));
+    assertNull(pw.getEnum(DbPlatformName.class, "junk", null));
+  }
+
   @Test
   public void testTrimPropertyValues() {
 

src/test/java/com/avaje/ebean/dbmigration/model/MigrationModelTest.java

@@ -1,39 +0,0 @@
-package com.avaje.ebean.dbmigration.model;
-
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.*;
-
-public class MigrationModelTest {
-
-  @Test
-  public void testRead() throws Exception {
-
-    MigrationModel migrationModel = new MigrationModel("dbmigration/app1");
-    ModelContainer model = migrationModel.read();
-
-    assertThat(migrationModel.getReadVersions()).contains("1.0","1.1","2.0");
-    assertThat(model.getTable("v10_table")).isNotNull();
-  }
-
-  @Test
-  public void testRead_leadingSlash() throws Exception {
-
-    MigrationModel migrationModel = new MigrationModel("/dbmigration/app1");
-    ModelContainer model = migrationModel.read();
-
-    assertThat(migrationModel.getReadVersions()).contains("1.0","1.1","2.0");
-    assertThat(model.getTable("v10_table")).isNotNull();
-  }
-
-  @Test
-  public void testRead_trailingSlash() throws Exception {
-
-    MigrationModel migrationModel = new MigrationModel("/dbmigration/app1/");
-    ModelContainer model = migrationModel.read();
-
-    assertThat(migrationModel.getReadVersions()).contains("1.0","1.1","2.0");
-    assertThat(model.getTable("v10_table")).isNotNull();
-  }
-
-}

src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java

@@ -0,0 +1,47 @@
+package com.avaje.ebean.dbmigration.model;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class MigrationVersionTest {
+
+  @Test
+  public void testParse() throws Exception {
+
+    MigrationVersion v0 = MigrationVersion.parse("1.1.1_2__Foo");
+    MigrationVersion v1 = MigrationVersion.parse("1.1.1.2_junk");
+    MigrationVersion v2 = MigrationVersion.parse("1.1_1.2_foo");
+
+    assertThat(v0.compareTo(v1)).isEqualTo(0);
+    assertThat(v1.compareTo(v0)).isEqualTo(0);
+    assertThat(v1.compareTo(v2)).isEqualTo(0);
+
+  }
+
+  @Test
+  public void testNextVersion() {
+
+    assertThat(MigrationVersion.parse("2").nextVersion()).isEqualTo("3");
+    assertThat(MigrationVersion.parse("1.0").nextVersion()).isEqualTo("1.1");
+    assertThat(MigrationVersion.parse("2.0.b34").nextVersion()).isEqualTo("2.1");
+    assertThat(MigrationVersion.parse("1.1.1_2__Foo").nextVersion()).isEqualTo("1.1.1.3");
+    assertThat(MigrationVersion.parse("1.1.1.2_junk").nextVersion()).isEqualTo("1.1.1.3");
+  }
+
+  @Test
+  public void testCompareTo() throws Exception {
+
+    MigrationVersion v1 = MigrationVersion.parse("1.1.1.2_junk");
+    MigrationVersion v2 = MigrationVersion.parse("2.1_1.2_junk");
+    MigrationVersion v3 = MigrationVersion.parse("1.2_1.2_junk");
+    MigrationVersion v4 = MigrationVersion.parse("1.1_1.3_junk");
+    MigrationVersion v5 = MigrationVersion.parse("1.1.1.1_junk");
+
+    assertThat(v1.compareTo(v2)).isEqualTo(-1);
+    assertThat(v1.compareTo(v3)).isEqualTo(-1);
+    assertThat(v1.compareTo(v4)).isEqualTo(-1);
+
+    assertThat(v1.compareTo(v5)).isEqualTo(1);
+  }
+}

src/test/java/com/avaje/ebean/server/type/MyDayOfWeek.java

@@ -0,0 +1,17 @@
+package com.avaje.ebean.server.type;
+
+import com.avaje.ebean.annotation.EnumValue;
+
+/**
+ * Enum test when DB CHAR column used with spaces.
+ */
+public enum MyDayOfWeek {
+
+  @EnumValue("MONDAY   ") MONDAY,
+  @EnumValue("TUESDAY  ") TUESDAY,
+  @EnumValue("WEDNESDAY") WEDNESDAY,
+  @EnumValue("THURSDAY ") THURSDAY,
+  @EnumValue("FRIDAY   ") FRIDAY,
+  @EnumValue("SATURDAY ") SATURDAY,
+  @EnumValue("SUNDAY   ") SUNDAY
+}

src/test/java/com/avaje/ebean/server/type/TestTypeManager.java

@@ -1,34 +1,55 @@
 package com.avaje.ebean.server.type;
 
-import java.sql.Types;
-
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.avaje.ebean.BaseTestCase;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.H2Platform;
 import com.avaje.ebeaninternal.server.core.BootupClasses;
 import com.avaje.ebeaninternal.server.type.CtCompoundType;
 import com.avaje.ebeaninternal.server.type.DefaultTypeManager;
+import com.avaje.ebeaninternal.server.type.RsetDataReader;
 import com.avaje.ebeaninternal.server.type.ScalarDataReader;
 import com.avaje.ebeaninternal.server.type.ScalarType;
 import com.avaje.ebeaninternal.server.type.reflect.CheckImmutableResponse;
 import com.avaje.tests.model.ivo.CMoney;
 import com.avaje.tests.model.ivo.ExhangeCMoneyRate;
 import com.avaje.tests.model.ivo.Money;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.sql.SQLException;
+import java.sql.Types;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TestTypeManager extends BaseTestCase {
 
+  @Test
+  public void testEnumWithChar() throws SQLException {
+
+    DefaultTypeManager typeManager = createTypeManager();
+
+    ScalarType<?> dayOfWeekType = typeManager.createEnumScalarType(MyDayOfWeek.class);
+
+    Object val = dayOfWeekType.read(new DummyDataReader("MONDAY   "));
+    assertThat(val).isEqualTo(MyDayOfWeek.MONDAY);
+
+    val = dayOfWeekType.read(new DummyDataReader("TUESDAY  "));
+    assertThat(val).isEqualTo(MyDayOfWeek.TUESDAY);
+
+    val = dayOfWeekType.read(new DummyDataReader("WEDNESDAY"));
+    assertThat(val).isEqualTo(MyDayOfWeek.WEDNESDAY);
+
+    val = dayOfWeekType.read(new DummyDataReader("THURSDAY "));
+    assertThat(val).isEqualTo(MyDayOfWeek.THURSDAY);
+
+    val = dayOfWeekType.read(new DummyDataReader("FRIDAY   "));
+    assertThat(val).isEqualTo(MyDayOfWeek.FRIDAY);
+  }
+
   @Test
   public void test() {
 
-    ServerConfig serverConfig = new ServerConfig();
-    serverConfig.setDatabasePlatform(new H2Platform());
-
-    BootupClasses bootupClasses = new BootupClasses();
-
-    DefaultTypeManager typeManager = new DefaultTypeManager(serverConfig, bootupClasses);
+    DefaultTypeManager typeManager = createTypeManager();
 
     CheckImmutableResponse checkImmutable = typeManager.checkImmutable(Money.class);
     Assert.assertTrue(checkImmutable.isImmutable());
@@ -50,4 +71,31 @@ public class TestTypeManager extends BaseTestCase {
 
   }
 
+  private DefaultTypeManager createTypeManager() {
+
+    ServerConfig serverConfig = new ServerConfig();
+    serverConfig.setDatabasePlatform(new H2Platform());
+
+    BootupClasses bootupClasses = new BootupClasses();
+
+    return new DefaultTypeManager(serverConfig, bootupClasses);
+  }
+
+  /**
+   * Test double DataReader implementation.
+   */
+  private static class DummyDataReader extends RsetDataReader {
+
+    String val;
+
+    public DummyDataReader(String val) {
+      super(null);
+      this.val = val;
+    }
+
+    @Override
+    public String getString() throws SQLException {
+      return val;
+    }
+  }
 }

src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java

@@ -512,6 +512,11 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
+  @Override
+  public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction) {
+    return null;
+  }
+
   @Override
   public <T> Set<T> findSet(Query<T> query, Transaction transaction) {
     return null;

src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java

@@ -1,5 +1,6 @@
 package com.avaje.ebeaninternal.server.deploy.generatedproperty;
 
+import com.avaje.ebean.config.ClassLoadConfig;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import org.junit.Test;
 
@@ -11,7 +12,7 @@ import static org.junit.Assert.*;
 
 public class InsertTimestampFactoryTest {
 
-  InsertTimestampFactory factory = new InsertTimestampFactory();
+  InsertTimestampFactory factory = new InsertTimestampFactory(new ClassLoadConfig());
 
   @Test
   public void test_createdTimestamp_LocalDateTime() {

src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java

@@ -1,5 +1,6 @@
 package com.avaje.ebeaninternal.server.deploy.generatedproperty;
 
+import com.avaje.ebean.config.ClassLoadConfig;
 import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import org.junit.Test;
 
@@ -12,7 +13,7 @@ import static org.junit.Assert.*;
 public class UpdateTimestampFactoryTest {
 
 
-  UpdateTimestampFactory factory = new UpdateTimestampFactory();
+  UpdateTimestampFactory factory = new UpdateTimestampFactory(new ClassLoadConfig());
 
   @Test
   public void test_createdTimestamp_LocalDateTime() {

src/test/java/com/avaje/tests/basic/TestInEmpty.java

@@ -2,23 +2,37 @@ package com.avaje.tests.basic;
 
 import java.util.List;
 
-import org.junit.Assert;
+import com.avaje.ebean.Query;
 import org.junit.Test;
 
 import com.avaje.ebean.BaseTestCase;
 import com.avaje.ebean.Ebean;
 import com.avaje.tests.model.basic.Order;
 
+import static org.assertj.core.api.StrictAssertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
 public class TestInEmpty extends BaseTestCase {
 
   @Test
-  public void test() {
+  public void test_in_empty() {
 
-    List<Order> list = Ebean.find(Order.class).where().gt("id", 0).in("id", new Object[0])
-        .findList();
+    Query<Order> query = Ebean.find(Order.class).where().in("id", new Object[0]).gt("id", 0)
+        .query();
 
-    Assert.assertEquals(0, list.size());
+    List<Order> list = query.findList();
+    assertThat(query.getGeneratedSql()).contains("1=0");
+    assertEquals(0, list.size());
+  }
 
+  @Test
+  public void test_notIn_empty() {
+
+    Query<Order> query = Ebean.find(Order.class).where().notIn("id", new Object[0]).gt("id", 0)
+        .query();
+
+    query.findList();
+    assertThat(query.getGeneratedSql()).contains("1=1");
   }
 
 }

src/test/java/com/avaje/tests/draftable/DocLinkTest.java

@@ -0,0 +1,299 @@
+package com.avaje.tests.draftable;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.Query;
+import com.avaje.tests.model.draftable.Doc;
+import com.avaje.tests.model.draftable.Link;
+import org.assertj.core.api.StrictAssertions;
+import org.avaje.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import javax.persistence.PersistenceException;
+import java.sql.Timestamp;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class DocLinkTest extends BaseTestCase {
+
+  @Test
+  public void testLazyLoadOnDraftProperty() {
+
+    Link link1 = new Link("something");
+    link1.save();
+
+    Ebean.getDefaultServer().publish(Link.class, link1.getId());
+
+    Link link = Ebean.find(Link.class)
+        .setId(link1.getId())
+        .select("name")
+        .findUnique();
+
+    assertThat(link).isNotNull();
+
+    LoggedSqlCollector.start();
+
+    // no lazy loading is invoked as draft property considered @Transient
+    assertThat(link.isDraft()).isFalse();
+
+    List<String> loggedSql = LoggedSqlCollector.stop();
+    assertThat(loggedSql).isEmpty();
+
+  }
+
+  @Test
+  public void testUpdate_whenNotPublished() {
+
+    Link link1 = new Link("update");
+    StrictAssertions.assertThat(link1.isDraft()).isFalse();
+
+    link1.save();
+    StrictAssertions.assertThat(link1.isDraft()).isTrue();
+
+    // perform stateless update
+    Link linkUpdate = new Link();
+    linkUpdate.setId(link1.getId());
+    linkUpdate.setComment("stateless update");
+    linkUpdate.setDraft(true);
+    linkUpdate.update();
+
+    // invoke lazy loading on the updated bean
+    // automatically set asDraft() on lazy loading query
+    linkUpdate.getLocation();
+
+    Ebean.deletePermanent(linkUpdate);
+  }
+
+  @Test
+  public void testDelete_whenNotPublished() {
+
+    Link link1 = new Link("Ld1");
+    StrictAssertions.assertThat(link1.isDraft()).isFalse();
+
+    link1.save();
+    StrictAssertions.assertThat(link1.isDraft()).isTrue();
+
+    link1.setComment("some change");
+    link1.save();
+
+    Ebean.delete(link1);
+  }
+
+
+  @Test
+  public void testDeletePermanent_whenPublished2() {
+
+    Link link1 = new Link("Ld2");
+    link1.save();
+    Ebean.getDefaultServer().publish(Link.class, link1.getId());
+
+    Link link = Ebean.find(Link.class).setId(link1.getId()).asDraft().findUnique();
+    Ebean.deletePermanent(link);
+  }
+
+  @Test
+  public void testDeleteLivePermanent_throwsException() {
+
+    Link link1 = new Link("Ld2");
+    link1.save();
+
+    Link live = Ebean.getDefaultServer().publish(Link.class, link1.getId());
+
+    try {
+      Ebean.deletePermanent(live);
+      assertTrue("never get here",false);
+
+    } catch (PersistenceException e) {
+      // assert nice message when trying to delete live bean
+      assertThat(e.getMessage().contains("Explicit Delete is not allowed on a 'live' bean - only draft beans"));
+    }
+  }
+
+  @Test
+  public void testDelete_whenPublished() {
+
+    Link link1 = new Link("Ld2");
+    link1.save();
+    EbeanServer server = Ebean.getDefaultServer();
+    server.publish(Link.class, link1.getId());
+
+    link1 = Ebean.find(Link.class).setId(link1.getId()).asDraft().findUnique();
+    StrictAssertions.assertThat(link1.isDraft()).isTrue();
+
+    // this is a soft delete (no automatic publish here, only updates draft)
+    link1.delete();
+
+    Link live = Ebean.find(Link.class).setId(link1.getId()).findUnique();
+    assertThat(live).isNotNull();
+    StrictAssertions.assertThat(live.isDraft()).isFalse();
+    StrictAssertions.assertThat(live.isDeleted()).isFalse(); // soft delete state not published yet
+
+    // this is a permanent delete (effectively has automatic publish)
+    server.deletePermanent(link1);
+
+    live = Ebean.find(Link.class).setId(link1.getId()).findUnique();
+    assertThat(live).isNull();
+  }
+
+  @Test
+  public void testUpdateLive_throwsException() {
+
+    Link link1 = new Link("forUpdateLive");
+    link1.save();
+
+    Link live = Ebean.getDefaultServer().publish(Link.class, link1.getId());
+
+    live.setComment("foo");
+    // Expect a nice
+    try {
+      live.save();
+      assertTrue("Never get here",false);
+
+    } catch (PersistenceException e) {
+      // we want to assert the message is nice and meaningful (and not a optimistic locking exception etc)
+      assertThat(e.getMessage()).contains("Save or update is not allowed on a 'live' bean - only draft beans");
+    }
+  }
+
+  @Test
+  public void testDirtyState() {
+
+    Timestamp when = new Timestamp(System.currentTimeMillis());
+    String comment = "Really interesting";
+
+    Link link1 = new Link("Ls1");
+    link1.setComment(comment);
+    link1.setWhenPublish(when);
+    link1.save();
+
+    Link draft1 = Ebean.find(Link.class).setId(link1.getId()).asDraft().findUnique();
+    StrictAssertions.assertThat(draft1.isDirty()).isTrue();
+
+    EbeanServer server = Ebean.getDefaultServer();
+
+    Link linkLive = server.publish(Link.class, link1.getId(), null);
+    StrictAssertions.assertThat(linkLive.getComment()).isEqualTo(comment);
+    StrictAssertions.assertThat(linkLive.getWhenPublish()).isEqualTo(when);
+
+    Link draft1b = Ebean.find(Link.class).setId(link1.getId()).asDraft().findUnique();
+    StrictAssertions.assertThat(draft1b.isDirty()).isFalse();
+    StrictAssertions.assertThat(draft1b.getComment()).isNull();
+    StrictAssertions.assertThat(draft1b.getWhenPublish()).isNull();
+
+  }
+
+  @Test
+  public void testSave() {
+
+    Link link1 = new Link("LinkOne");
+    link1.save();
+
+    Link link2 = new Link("LinkTwo");
+    link2.save();
+
+    Link link3 = new Link("LinkThree");
+    link3.save();
+
+    EbeanServer server = Ebean.getDefaultServer();
+    server.publish(Link.class, link1.getId(), null);
+    server.publish(Link.class, link2.getId(), null);
+    server.publish(Link.class, link3.getId(), null);
+
+    Doc doc1 = new Doc("DocOne");
+    doc1.getLinks().add(link1);
+    doc1.getLinks().add(link2);
+    doc1.save();
+
+    Doc draftDoc1 = server.find(Doc.class)
+        .setId(doc1.getId())
+        .asDraft()
+        .findUnique();
+
+    assertThat(draftDoc1.getLinks()).hasSize(2);
+
+    Doc liveDoc1 = server.publish(Doc.class, doc1.getId(), null);
+
+    assertThat(liveDoc1.getLinks()).hasSize(2);
+    assertThat(liveDoc1.getLinks()).extracting("id").contains(link1.getId(), link2.getId());
+
+
+    draftDoc1.getLinks().remove(0);
+    draftDoc1.getLinks().add(link3);
+
+    draftDoc1.save();
+
+    // publish with insert and delete of Links M2M relationship
+    Doc liveDoc2 = server.publish(Doc.class, doc1.getId(), null);
+    assertThat(liveDoc2.getLinks()).hasSize(2);
+    assertThat(liveDoc2.getLinks()).extracting("id").contains(link2.getId(), link3.getId());
+
+    // delete the draft and live beans (with associated children)
+    draftDoc1.delete();
+  }
+
+
+  @Test
+  public void testDraftRestore() {
+
+    Link link1 = new Link("Ldr1");
+    link1.setLocation("firstLocation");
+    link1.save();
+
+    EbeanServer server = Ebean.getDefaultServer();
+
+    Link live = server.publish(Link.class, link1.getId(), null);
+    StrictAssertions.assertThat(live.isDraft()).isFalse();
+
+    Link draftLink = Ebean.find(Link.class)
+        .setId(link1.getId())
+        .asDraft()
+        .findUnique();
+
+    draftLink.setLocation("secondLocation");
+    draftLink.save();
+
+    server.draftRestore(Link.class, link1.getId(), null);
+
+    draftLink = Ebean.find(Link.class)
+        .setId(link1.getId())
+        .asDraft()
+        .findUnique();
+
+    StrictAssertions.assertThat(draftLink.getLocation()).isEqualTo("firstLocation");
+
+  }
+
+  @Test
+  public void testDraftRestoreViaQuery() {
+
+    Link link1 = new Link("Ldr1");
+    link1.setLocation("firstLocation");
+    link1.setComment("Banana");
+    link1.save();
+
+    EbeanServer server = Ebean.getDefaultServer();
+
+    server.publish(Link.class, link1.getId(), null);
+
+    Link draftLink = Ebean.find(Link.class)
+        .setId(link1.getId())
+        .asDraft()
+        .findUnique();
+
+    draftLink.setLocation("secondLocation");
+    draftLink.setComment("A good change");
+    draftLink.save();
+
+    Query<Link> query = server.find(Link.class).where().eq("id", link1.getId()).query();
+    List<Link> links = server.draftRestore(query);
+
+    assertThat(links).hasSize(1);
+    StrictAssertions.assertThat(links.get(0).getLocation()).isEqualTo("firstLocation");
+    StrictAssertions.assertThat(links.get(0).isDirty()).isEqualTo(false);
+    StrictAssertions.assertThat(links.get(0).getComment()).isNull();
+
+  }
+}

src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java

@@ -0,0 +1,58 @@
+package com.avaje.tests.draftable;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.PagedList;
+import com.avaje.ebean.Query;
+import com.avaje.tests.model.draftable.Link;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class LinkQueryPublishTest {
+
+  @Test
+  public void testPublishViaQuery() {
+
+    Link link1 = new Link("L1");
+    link1.save();
+
+    Link link2 = new Link("L2");
+    link2.save();
+
+    Link link3 = new Link("L3");
+    link3.save();
+
+    EbeanServer server = Ebean.getDefaultServer();
+
+    List<Object> ids = new ArrayList<Object>();
+    ids.add(link1.getId());
+    ids.add(link2.getId());
+    ids.add(link3.getId());
+
+    PagedList<Link> pagedList =
+        server.find(Link.class).asDraft()
+        .where().idIn(ids)
+        .setMaxRows(10)
+        .findPagedList();
+
+    assertThat(pagedList.getTotalRowCount()).isEqualTo(3);
+
+
+    Query<Link> pubQuery = server.find(Link.class)
+        .where().idIn(ids)
+        .order().asc("id");
+
+
+    List<Link> pubList = server.publish(pubQuery);
+
+    assertThat(pubList).hasSize(3);
+    assertThat(pubList).extracting("id").contains(link1.getId(), link2.getId(), link3.getId());
+
+  }
+
+
+}

src/test/java/com/avaje/tests/draftable/OrganisationTest.java

@@ -0,0 +1,116 @@
+package com.avaje.tests.draftable;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.EbeanServer;
+import com.avaje.tests.model.draftable.Document;
+import com.avaje.tests.model.draftable.DocumentMedia;
+import com.avaje.tests.model.draftable.Organisation;
+import org.assertj.core.api.StrictAssertions;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public class OrganisationTest {
+
+  @Test
+  public void testSave() {
+
+    Organisation org = new Organisation("OrgOne");
+    org.save();
+
+    assertNotNull(org.getId());
+
+    Document doc = new Document();
+    doc.setTitle("NewTitle");
+    doc.setOrganisation(org);
+    doc.setBody("Hello");
+
+    doc.save();
+
+    doc.setBody("Change content");
+    doc.save();
+
+
+    EbeanServer server = Ebean.getDefaultServer();
+
+    Document draftDoc = server.find(Document.class)
+        .asDraft()
+        .setId(doc.getId())
+        .findUnique();
+
+    assertNotNull(draftDoc);
+
+    Document liveDoc = server.find(Document.class)
+        .setId(doc.getId())
+        .findUnique();
+    assertNull(liveDoc);
+
+
+    server.publish(Document.class, doc.getId(), null);
+
+    doc.setTitle("Mod1");
+    doc.save();
+
+    server.publish(Document.class, doc.getId(), null);
+
+  }
+
+
+
+  @Test
+  public void testSaveWithCascade() {
+
+    Organisation org = new Organisation("Org2");
+    org.save();
+
+    Document doc = new Document();
+    doc.setTitle("Title1");
+    doc.setOrganisation(org);
+    doc.setBody("Body1");
+
+    doc.getMedia().add(createMedia("media1"));
+    doc.getMedia().add(createMedia("media2"));
+    doc.save();
+
+    EbeanServer server = Ebean.getDefaultServer();
+
+
+    server.publish(Document.class, doc.getId(), null);
+
+    Document fetchDoc = Ebean.find(Document.class).setId(doc.getId()).asDraft().findUnique();
+    List<DocumentMedia> media = fetchDoc.getMedia();
+
+    assertThat(media.size()).isEqualTo(2);
+
+//    // delete one of the 'child' @DraftElement rows ...
+//    SqlUpdate sqlUpdate = Ebean.createSqlUpdate("delete from document_media_draft where id = ?");
+//    sqlUpdate.setParameter(1, doc.getMedia().get(0).getId());
+//    sqlUpdate.execute();
+
+    doc.getMedia().get(1).setDescription("mod");
+    doc.getMedia().add(createMedia("media3"));
+    doc.getMedia().remove(0);
+    doc.setBody("Body2");
+    doc.save();
+
+    // publish will perform an insert, update and delete on child DocumentMedia
+    // during the publish below with media1 being deleted
+    Document liveBean = server.publish(Document.class, doc.getId(), null);
+    StrictAssertions.assertThat(liveBean.getBody()).isEqualTo("Body2");
+    StrictAssertions.assertThat(liveBean.getMedia().size()).isEqualTo(2);
+    assertThat(liveBean.getMedia()).extracting("name").contains("media2","media3");
+
+  }
+
+  @NotNull
+  private DocumentMedia createMedia(String name) {
+    DocumentMedia media = new DocumentMedia();
+    media.setName(name);
+    return media;
+  }
+}

src/test/java/com/avaje/tests/model/basic/Customer.java

@@ -2,6 +2,7 @@ package com.avaje.tests.model.basic;
 
 import com.avaje.ebean.annotation.ChangeLog;
 import com.avaje.ebean.annotation.ChangeLogInsertMode;
+import com.avaje.ebean.annotation.DbComment;
 import com.avaje.ebean.annotation.DbEnumValue;
 import com.avaje.ebean.annotation.JsonIgnore;
 import com.avaje.ebean.annotation.Where;
@@ -26,6 +27,7 @@ import java.util.concurrent.locks.ReentrantLock;
 @ChangeLog(inserts = ChangeLogInsertMode.EXCLUDE, updatesThatInclude = {"name","status"})
 @Entity
 @Table(name = "o_customer")
+@DbComment("Holds external customers")
 public class Customer extends BasicDomain {
 
   private static final long serialVersionUID = 1L;
@@ -60,15 +62,18 @@ public class Customer extends BasicDomain {
   @Transient
   ReentrantLock lock = new ReentrantLock();
 
+  @DbComment("status of the customer")
   Status status;
 
   @NotNull
   @Size(max = 40)
   String name;
 
+  @DbComment("Short notes regarding the customer")
   @Size(max = 100)
   String smallnote;
 
+  @DbComment("Join date of the customer")
   @NotNull(groups = { ValidationGroupSomething.class })
   Date anniversary;
 

src/test/java/com/avaje/tests/model/basic/first/Second.java

@@ -1,9 +1,12 @@
 package com.avaje.tests.model.basic.first;
 
+import javax.persistence.AttributeOverride;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+@AttributeOverride(name="name", column=@Column(name = "mod_name"))
 @Entity
 @Table(name = "f_second")
 public class Second extends SuperSecond {

src/test/java/com/avaje/tests/model/basic/first/SuperSecond.java

@@ -8,6 +8,8 @@ import javax.persistence.OneToOne;
 @MappedSuperclass
 public abstract class SuperSecond {
 
+  protected String name;
+
   @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
   @JoinColumn(name = "first")
   protected First first;
@@ -20,4 +22,11 @@ public abstract class SuperSecond {
     this.first = first;
   }
 
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
 }

src/test/java/com/avaje/tests/model/basic/first/TestFirstSecond.java

@@ -15,7 +15,8 @@ public class TestFirstSecond extends BaseTestCase {
     Ebean.save(first);
 
     Second second = new Second();
-    second.setTitle("John");
+    second.setName("Jim");
+    second.setTitle("Sir");
     second.setFirst(first);
     Ebean.save(second);
 
@@ -23,7 +24,5 @@ public class TestFirstSecond extends BaseTestCase {
     second.getFirst().setName("changed");
     Ebean.save(second);
     Ebean.save(first);
-
-    
   }
 }

src/test/java/com/avaje/tests/model/draftable/BaseDomain.java

@@ -0,0 +1,58 @@
+package com.avaje.tests.model.draftable;
+
+import com.avaje.ebean.Model;
+import com.avaje.ebean.annotation.WhenCreated;
+import com.avaje.ebean.annotation.WhenModified;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+import java.sql.Timestamp;
+
+@MappedSuperclass
+public class BaseDomain extends Model {
+
+  @Id
+  Long id;
+
+  @Version
+  Long version;
+
+  @WhenCreated
+  Timestamp whenCreated;
+
+  @WhenModified
+  Timestamp whenModified;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Long getVersion() {
+    return version;
+  }
+
+  public void setVersion(Long version) {
+    this.version = version;
+  }
+
+  public Timestamp getWhenCreated() {
+    return whenCreated;
+  }
+
+  public void setWhenCreated(Timestamp whenCreated) {
+    this.whenCreated = whenCreated;
+  }
+
+  public Timestamp getWhenModified() {
+    return whenModified;
+  }
+
+  public void setWhenModified(Timestamp whenModified) {
+    this.whenModified = whenModified;
+  }
+}

src/test/java/com/avaje/tests/model/draftable/Doc.java

@@ -0,0 +1,39 @@
+package com.avaje.tests.model.draftable;
+
+import com.avaje.ebean.annotation.Draftable;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+import java.util.List;
+
+
+@Draftable
+@Entity
+public class Doc extends BaseDomain {
+
+  String name;
+
+  @ManyToMany(cascade = CascadeType.ALL)
+  List<Link> links;
+
+  public Doc(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<Link> getLinks() {
+    return links;
+  }
+
+  public void setLinks(List<Link> links) {
+    this.links = links;
+  }
+}

src/test/java/com/avaje/tests/model/draftable/Document.java

@@ -0,0 +1,75 @@
+package com.avaje.tests.model.draftable;
+
+import com.avaje.ebean.annotation.DraftOnly;
+import com.avaje.ebean.annotation.Draftable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import java.sql.Timestamp;
+import java.util.List;
+
+
+@Draftable
+@Entity
+public class Document extends BaseDomain {
+
+  @Column(unique = true)
+  String title;
+
+  String body;
+
+  @DraftOnly
+  Timestamp whenPublish;
+
+  @ManyToOne
+  Organisation organisation;
+
+  /**
+   * Relationship to draftable elements.
+   */
+  //@PrivateOwned
+  @OneToMany(mappedBy = "document")//, cascade = CascadeType.ALL)
+  List<DocumentMedia> media;
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getBody() {
+    return body;
+  }
+
+  public void setBody(String body) {
+    this.body = body;
+  }
+
+  public Organisation getOrganisation() {
+    return organisation;
+  }
+
+  public void setOrganisation(Organisation organisation) {
+    this.organisation = organisation;
+  }
+
+  public List<DocumentMedia> getMedia() {
+    return media;
+  }
+
+  public void setMedia(List<DocumentMedia> media) {
+    this.media = media;
+  }
+
+  public Timestamp getWhenPublish() {
+    return whenPublish;
+  }
+
+  public void setWhenPublish(Timestamp whenPublish) {
+    this.whenPublish = whenPublish;
+  }
+}

src/test/java/com/avaje/tests/model/draftable/DocumentMedia.java

@@ -0,0 +1,45 @@
+package com.avaje.tests.model.draftable;
+
+import com.avaje.ebean.annotation.DraftableElement;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+/**
+ * 'Owned' by @Draftable root.
+ */
+@DraftableElement
+@Entity
+public class DocumentMedia extends BaseDomain {
+
+  @ManyToOne
+  Document document;
+
+  String name;
+
+  String description;
+
+  public Document getDocument() {
+    return document;
+  }
+
+  public void setDocument(Document document) {
+    this.document = document;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+}

src/test/java/com/avaje/tests/model/draftable/Link.java

@@ -0,0 +1,126 @@
+package com.avaje.tests.model.draftable;
+
+import com.avaje.ebean.annotation.Draft;
+import com.avaje.ebean.annotation.DraftDirty;
+import com.avaje.ebean.annotation.DraftReset;
+import com.avaje.ebean.annotation.Draftable;
+import com.avaje.ebean.annotation.History;
+import com.avaje.ebean.annotation.SoftDelete;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+import java.sql.Timestamp;
+import java.util.List;
+
+
+@History
+@Draftable
+@Entity
+public class Link extends BaseDomain {
+
+  @SoftDelete
+  boolean deleted;
+
+  String name;
+
+  String location;
+
+  /**
+   * Draft reset to null on publish.
+   */
+  @DraftReset
+  Timestamp whenPublish;
+
+  /**
+   * Draft reset to null on publish.
+   */
+  @DraftReset
+  String comment;
+
+  /**
+   * Indicates if the instance is a 'draft' or 'live' bean.
+   */
+  @Draft
+  boolean draft;
+
+  /**
+   * Indicates if the draft has modifications that have not been published
+   * to 'live'. This is automatically set when a draft is saved.
+   */
+  @DraftDirty
+  boolean dirty;
+
+  @ManyToMany(mappedBy = "links")
+  List<Doc> docs;
+
+  public Link(String name) {
+    this.name = name;
+  }
+
+  public Link() {
+  }
+
+  public boolean isDraft() {
+    return draft;
+  }
+
+  public void setDraft(boolean draft) {
+    this.draft = draft;
+  }
+
+  public boolean isDeleted() {
+    return deleted;
+  }
+
+  public void setDeleted(boolean deleted) {
+    this.deleted = deleted;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public void setLocation(String location) {
+    this.location = location;
+  }
+
+  public List<Doc> getDocs() {
+    return docs;
+  }
+
+  public void setDocs(List<Doc> docs) {
+    this.docs = docs;
+  }
+
+  public boolean isDirty() {
+    return dirty;
+  }
+
+  public void setDirty(boolean dirty) {
+    this.dirty = dirty;
+  }
+
+  public Timestamp getWhenPublish() {
+    return whenPublish;
+  }
+
+  public void setWhenPublish(Timestamp whenPublish) {
+    this.whenPublish = whenPublish;
+  }
+
+  public String getComment() {
+    return comment;
+  }
+
+  public void setComment(String comment) {
+    this.comment = comment;
+  }
+}

src/test/java/com/avaje/tests/model/draftable/Organisation.java

@@ -0,0 +1,21 @@
+package com.avaje.tests.model.draftable;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Organisation extends BaseDomain {
+
+  String name;
+
+  public Organisation(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}

src/test/java/com/avaje/tests/model/softdelete/ESoftDelMid.java

@@ -2,7 +2,6 @@ package com.avaje.tests.model.softdelete;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import java.util.List;
@@ -10,7 +9,7 @@ import java.util.List;
 @Entity
 public class ESoftDelMid extends BaseSoftDelete {
 
-  @ManyToOne(optional = false)
+  @ManyToOne
   ESoftDelTop top;
 
   String mid;

src/test/java/com/avaje/tests/model/softdelete/ESoftDelTop.java

@@ -2,28 +2,27 @@ package com.avaje.tests.model.softdelete;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import java.util.List;
 
 @Entity
 public class ESoftDelTop extends BaseSoftDelete {
 
-  String top;
+  String name;
 
   @OneToMany(mappedBy = "top", cascade = CascadeType.ALL)
   List<ESoftDelMid> mids;
 
-  public ESoftDelTop(String top) {
-    this.top = top;
+  public ESoftDelTop(String name) {
+    this.name = name;
   }
 
-  public String getTop() {
-    return top;
+  public String getName() {
+    return name;
   }
 
-  public void setTop(String top) {
-    this.top = top;
+  public void setName(String top) {
+    this.name = name;
   }
 
   public List<ESoftDelMid> getMids() {

src/test/java/com/avaje/tests/query/TestQueryFindIterate.java

@@ -82,6 +82,7 @@ public class TestQueryFindIterate extends BaseTestCase {
             .select("status, orderDate")
             .fetch("customer", "name")
             .where().gt("id",0).le("id",10)
+            .setUseCache(false)
             .findIterate();
 
     try {

src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java

@@ -8,6 +8,7 @@ import com.avaje.tests.model.basic.ResetBasicData;
 import org.avaje.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 
+import javax.persistence.PersistenceException;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -16,10 +17,126 @@ import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class TestQueryFindPagedList extends BaseTestCase {
 
+
+  @Test(expected = PersistenceException.class)
+  public void test_noMaxRows() throws ExecutionException, InterruptedException {
+
+    Ebean.find(Order.class).findPagedList();
+  }
+
+  @Test
+  public void test_maxRows_NoCount() throws ExecutionException, InterruptedException {
+
+    ResetBasicData.reset();
+
+    PagedList<Order> pagedList = Ebean.find(Order.class)
+        .setMaxRows(4)
+        .findPagedList();
+
+    LoggedSqlCollector.start();
+
+    List<Order> orders = pagedList.getList();
+
+    assertTrue(!orders.isEmpty());
+    List<String> loggedSql = LoggedSqlCollector.stop();
+
+    assertEquals("Only 1 SQL statement, no count query",1, loggedSql.size());
+  }
+
+
+  @Test
+  public void test_maxRows_countInBackground() throws ExecutionException, InterruptedException, TimeoutException {
+
+    ResetBasicData.reset();
+
+    PagedList<Order> pagedList = Ebean.find(Order.class)
+        .setMaxRows(3)
+        .findPagedList();
+
+    Future<Integer> rowCount = pagedList.getFutureRowCount();
+    List<Order> orders = pagedList.getList();
+
+    // these are each getting the total row count
+    int totalRowCount = pagedList.getTotalRowCount();
+    Integer totalRowCountWithTimeout = rowCount.get(30, TimeUnit.SECONDS);
+    Integer totalRowCountViaFuture = rowCount.get();
+
+    assertTrue(orders.size() < totalRowCount);
+    assertEquals(Integer.valueOf(totalRowCount), totalRowCountViaFuture);
+    assertEquals(Integer.valueOf(totalRowCount), totalRowCountWithTimeout);
+  }
+
+  @Test
+  public void test_maxRows_countInBackground_withLoadRowCount() throws InterruptedException {
+
+    ResetBasicData.reset();
+
+    // fetch less that total orders (page size 3)
+    PagedList<Order> pagedList = Ebean.find(Order.class)
+        .setMaxRows(3)
+        .findPagedList();
+
+    pagedList.loadRowCount();
+    List<Order> orders = pagedList.getList();
+    int totalRowCount = pagedList.getTotalRowCount();
+
+    assertThat(orders.size()).isLessThan(totalRowCount);
+    assertTrue(pagedList.hasNext());
+    assertFalse(pagedList.hasPrev());
+
+
+    // fetch less that total orders (page size 3)
+    PagedList<Order> pagedList2 = Ebean.find(Order.class)
+        .setFirstRow(1)
+        .setMaxRows(3)
+        .findPagedList();
+
+    pagedList2.loadRowCount();
+    List<Order> orders2 = pagedList2.getList();
+    int totalRowCount2 = pagedList2.getTotalRowCount();
+    assertTrue(pagedList2.hasNext());
+    assertTrue(pagedList2.hasPrev());
+
+    assertThat(totalRowCount).isEqualTo(totalRowCount2);
+    assertThat(orders2.size()).isLessThan(totalRowCount);
+
+
+    PagedList<Order> pagedList3 = Ebean.find(Order.class)
+        .setFirstRow(2)
+        .setMaxRows(150)
+        .findPagedList();
+
+    assertFalse(pagedList3.hasNext());
+    assertTrue(pagedList3.hasPrev());
+
+    List<Order> list3 = pagedList3.getList();
+    String xtoYofZ = pagedList3.getDisplayXtoYofZ(" to ", " of ");
+    assertThat(xtoYofZ).isEqualTo("3 to "+totalRowCount+" of "+totalRowCount);
+    assertThat(list3.size()).isEqualTo(totalRowCount - 2);
+
+    PagedList<Order> pagedList4 = Ebean.find(Order.class)
+        .setFirstRow(0)
+        .setMaxRows(totalRowCount)
+        .findPagedList();
+
+    assertFalse(pagedList4.hasNext());
+    assertFalse(pagedList4.hasPrev());
+    assertThat(pagedList4.getDisplayXtoYofZ(" to ", " of ")).isEqualTo("1 to "+totalRowCount+" of "+totalRowCount);
+
+    PagedList<Order> pagedList5 = Ebean.find(Order.class)
+        .setFirstRow(0)
+        .setMaxRows(totalRowCount - 1)
+        .findPagedList();
+
+    assertTrue(pagedList5.hasNext());
+    assertFalse(pagedList5.hasPrev());
+  }
+
   @Test
   public void test_noCount() throws ExecutionException, InterruptedException {
 

src/test/java/com/avaje/tests/query/TestWhereRawClause.java

@@ -15,7 +15,25 @@ public class TestWhereRawClause extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Ebean.find(OrderDetail.class).where().not(Expr.eq("id", 1)).raw("orderQty < shipQty")
+    Ebean.find(OrderDetail.class)
+        .where()
+        .not(Expr.eq("id", 1))
+        .raw("orderQty < shipQty")
+        .findList();
+
+  }
+
+  @Test
+  public void testRawWithBindParams() {
+
+    ResetBasicData.reset();
+
+    Ebean.find(OrderDetail.class)
+        .where()
+        .ne("id", 42)
+        .raw("orderQty < ?", 100)
+        .gt("id", 1)
+        .raw("unitPrice > ? and product.id > ?", 2, 3)
         .findList();
 
   }

src/test/java/com/avaje/tests/query/other/TestWhereAnnotation.java

@@ -40,7 +40,9 @@ public class TestWhereAnnotation extends BaseTestCase {
     
     LoggedSqlCollector.start();
     
-    List<Customer> customers = Ebean.find(Customer.class).findList();
+    List<Customer> customers = Ebean.find(Customer.class)
+        .setUseCache(false)
+        .findList();
     
     List<Order> orders = customers.get(0).getOrders();
     orders.size();

src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java

@@ -135,8 +135,8 @@ public class TestSoftDeleteBasic extends BaseTestCase {
     String generatedSql = query1.getGeneratedSql();
 
     // first statement is a single bulk update of the children with SoftDelete
-    assertThat(generatedSql).contains("t0.deleted=");
-    assertThat(generatedSql).contains("t1.deleted=");
+    assertThat(generatedSql).contains("coalesce(t0.deleted,");
+    assertThat(generatedSql).contains("coalesce(t1.deleted,");
     assertThat(fetch1.get(0).getChildren()).hasSize(2);
 
     assertThat(fetch1.get(0).getNosdChildren()).hasSize(2);