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

.travis.yml

@@ -0,0 +1,23 @@
+language: java
+jdk:
+  - oraclejdk8
+
+addons:
+  postgresql: "9.4"
+
+services:
+  - postgresql
+
+before_script:
+  - psql -c 'create extension pgcrypto;' -U postgres
+  - psql -c 'create extension hstore;' -U postgres
+  - psql -c 'create extension postgis;' -U postgres
+  - psql -c 'create database unit;' -U postgres
+
+env:
+  - EBEAN_DB=h2
+  - EBEAN_DB=pg
+
+cache:
+  directories:
+  - $HOME/.m2

pom.xml

@@ -9,11 +9,11 @@
 
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm</artifactId>
-  <version>6.14.1</version>
+  <version>6.16.2</version>
   <packaging>jar</packaging>
 
   <name>avaje-ebeanorm</name>
-  <url>http://www.avaje.org</url>
+  <url>http://ebean-orm.github.io/</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -152,7 +152,7 @@
     <dependency>
       <groupId>org.avaje.ebeanorm</groupId>
       <artifactId>avaje-ebeanorm-agent</artifactId>
-      <version>4.8.1</version>
+      <version>4.9.1</version>
       <scope>test</scope>
     </dependency>
 

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

@@ -11,4 +11,14 @@ public interface AutoTune {
    */
   void collectProfiling();
 
+  /**
+   * Output the profiling.
+   * <p>
+   * When profiling updates are applied to tuning at runtime this reports all tuning and profiling combined.
+   * When profiling is not applied at runtime then this reports the diff report with new and diff entries relative
+   * to the existing tuning.
+   * </p>
+   */
+  void reportProfiling();
+
 }

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

@@ -58,15 +58,18 @@ class PrimaryServer {
    */
   private static String determineDefaultServerName() {
 
-    String defaultServerName = System.getProperty("datasource.default");
+    String defaultServerName = System.getenv("EBEAN_DB");
     if (isEmpty(defaultServerName)) {
-      defaultServerName = System.getProperty("ebean.default.datasource");
-    }
-    if (isEmpty(defaultServerName)) {
-      defaultServerName = globalProperties.getProperty("datasource.default");
-    }
-    if (isEmpty(defaultServerName)) {
-      defaultServerName = globalProperties.getProperty("ebean.default.datasource");
+      defaultServerName = System.getProperty("datasource.default");
+      if (isEmpty(defaultServerName)) {
+        defaultServerName = System.getProperty("ebean.default.datasource");
+        if (isEmpty(defaultServerName)) {
+          defaultServerName = globalProperties.getProperty("datasource.default");
+          if (isEmpty(defaultServerName)) {
+            defaultServerName = globalProperties.getProperty("ebean.default.datasource");
+          }
+        }
+      }
     }
     return defaultServerName;
   }

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

@@ -1,5 +1,10 @@
 package com.avaje.ebean.bean;
 
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.ValuePair;
+
+import javax.persistence.EntityNotFoundException;
+import javax.persistence.PersistenceException;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
@@ -11,12 +16,6 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.PersistenceException;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.ValuePair;
-
 /**
  * This is the object added to every entity bean using byte code enhancement.
  * <p>
@@ -92,6 +91,8 @@ public final class EntityBeanIntercept implements Serializable {
 
   private int lazyLoadProperty = -1;
 
+  private Object ownerId;
+
   /**
    * Create a intercept with a given entity.
    * <p>
@@ -349,11 +350,22 @@ public final class EntityBeanIntercept implements Serializable {
    * lazy loading and this bean might not be used by the client code at all.
    * Instead we will fail as soon as the client code tries to use this bean.
    * </p>
+   * @param lazyLoadPropertyIndex the property that is expected to be loaded
    */
-  public void checkLazyLoadFailure() {
-    if (lazyLoadProperty != -1) {
-      this.lazyLoadFailure = true;
+  public boolean isLazyLoadFailure(int lazyLoadPropertyIndex) {
+    if (lazyLoadProperty != -1 || !isLoadedProperty(lazyLoadPropertyIndex)) {
+      lazyLoadFailure = true;
+      return true;
     }
+    lazyLoadFailure = false;
+    return false;
+  }
+
+  /**
+   * Set the Id of the owner bean.
+   */
+  public void setOwnerId(Object ownerId) {
+    this.ownerId = ownerId;
   }
 
   /**
@@ -748,7 +760,7 @@ public final class EntityBeanIntercept implements Serializable {
 
     if (lazyLoadFailure) {
       // failed when batch lazy loaded by another bean in the batch
-      throw new EntityNotFoundException("Bean has been deleted - lazy loading failed");
+      throw new EntityNotFoundException("Lazy loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted");
     }
 
     if (lazyLoadProperty == -1) {
@@ -763,7 +775,7 @@ public final class EntityBeanIntercept implements Serializable {
 
       if (lazyLoadFailure) {
         // failed when lazy loading this bean
-        throw new EntityNotFoundException("Bean has been deleted - lazy loading failed");
+        throw new EntityNotFoundException("Lazy loading failed on type:" + owner.getClass().getName() + " id:" + ownerId + " - Bean has been deleted.");
       }
 
       // bean should be loaded and intercepting now. setLoaded() has

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

@@ -21,9 +21,13 @@ public class AutoTuneConfig {
 
   private double profilingRate = 0.01;
 
+  private int profilingUpdateFrequency;
+
   private int garbageCollectionWait = 100;
   
-  private boolean skipCollectionOnShutdown;
+  private boolean skipGarbageCollectionOnShutdown;
+
+  private boolean skipProfileReportingOnShutdown;
 
   public AutoTuneConfig() {
   }
@@ -56,6 +60,20 @@ public class AutoTuneConfig {
     this.profilingFile = profilingFile;
   }
 
+  /**
+   * Return the frequency in seconds the profiling should be collected and automatically applied to the tuning.
+   */
+  public int getProfilingUpdateFrequency() {
+    return profilingUpdateFrequency;
+  }
+
+  /**
+   * Set the frequency in seconds the profiling should be collected and automatically applied to the tuning.
+   */
+  public void setProfilingUpdateFrequency(int profilingUpdateFrequency) {
+    this.profilingUpdateFrequency = profilingUpdateFrequency;
+  }
+
   /**
    * Return the mode used when autoTune has not been explicit defined on a
    * query.
@@ -184,17 +202,33 @@ public class AutoTuneConfig {
   }
 
   /**
-   * Return true if profiling collection should be skipped on shutdown.
+   * Return true if triggering garbage collection should be skipped on shutdown.
+   * You might set this when System.GC() slows a application shutdown too much.
    */
-  public boolean isSkipCollectionOnShutdown() {
-    return skipCollectionOnShutdown;
+  public boolean isSkipGarbageCollectionOnShutdown() {
+    return skipGarbageCollectionOnShutdown;
   }
 
   /**
-   * Set to true if profiling collection should be skipped on shutdown.
+   * Set to true if triggering garbage collection should be skipped on shutdown.
+   * You might set this when System.GC() slows a application shutdown too much.
    */
-  public void setSkipCollectionOnShutdown(boolean skipCollectionOnShutdown) {
-    this.skipCollectionOnShutdown = skipCollectionOnShutdown;
+  public void setSkipGarbageCollectionOnShutdown(boolean skipGarbageCollectionOnShutdown) {
+    this.skipGarbageCollectionOnShutdown = skipGarbageCollectionOnShutdown;
+  }
+
+  /**
+   * Return true if profile reporting should be skipped on shutdown.
+   */
+  public boolean isSkipProfileReportingOnShutdown() {
+    return skipProfileReportingOnShutdown;
+  }
+
+  /**
+   * Set to true if profile reporting should be skipped on shutdown.
+   */
+  public void setSkipProfileReportingOnShutdown(boolean skipProfileReportingOnShutdown) {
+    this.skipProfileReportingOnShutdown = skipProfileReportingOnShutdown;
   }
 
   /**
@@ -206,13 +240,15 @@ public class AutoTuneConfig {
     queryTuningAddVersion = p.getBoolean("autoTune.queryTuningAddVersion", queryTuningAddVersion);
     queryTuningFile = p.get("autoTune.queryTuningFile", queryTuningFile);
 
-    skipCollectionOnShutdown = p.getBoolean("autoTune.skipCollectionOnShutdown", skipCollectionOnShutdown);
-    
+    skipGarbageCollectionOnShutdown = p.getBoolean("autoTune.skipGarbageCollectionOnShutdown", skipGarbageCollectionOnShutdown);
+    skipProfileReportingOnShutdown = p.getBoolean("autoTune.skipProfileReportingOnShutdown", skipProfileReportingOnShutdown);
+
     mode = p.getEnum(AutoTuneMode.class, "autoTune.mode", mode);
 
     profiling = p.getBoolean("autoTune.profiling", profiling);
     profilingBase = p.getInt("autoTune.profilingBase", profilingBase);
     profilingRate = p.getDouble("autoTune.profilingRate", profilingRate);
     profilingFile = p.get("autoTune.profilingFile", profilingFile);
+    profilingUpdateFrequency = p.getInt("autoTune.profilingUpdateFrequency", profilingUpdateFrequency);
   }
 }

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

@@ -212,6 +212,12 @@ public class ServerConfig {
 
   private boolean ddlRun;
 
+  private boolean ddlCreateOnly;
+
+  private String ddlInitSql;
+
+  private String ddlSeedSql;
+
   private boolean useJtaTransactionManager;
 
   /**
@@ -1529,19 +1535,81 @@ public class ServerConfig {
   }
 
   /**
-   * Set to true to run the DDL generation on startup.
+   * Set to true to generate the "create all" DDL on startup.
+   *
+   * Typically we want this on when we are running tests locally (and often using H2)
+   * and we want to create the full DB schema from scratch to run tests.
    */
   public void setDdlGenerate(boolean ddlGenerate) {
     this.ddlGenerate = ddlGenerate;
   }
 
   /**
-   * Set to true to run the generated DDL on startup.
+   * Set to true to run the generated "create all DDL" on startup.
+   *
+   * Typically we want this on when we are running tests locally (and often using H2)
+   * and we want to create the full DB schema from scratch to run tests.
    */
   public void setDdlRun(boolean ddlRun) {
     this.ddlRun = ddlRun;
   }
 
+  /**
+   * Return true if the "drop all ddl" should be skipped.
+   *
+   * Typically we want to do this when using H2 (in memory) as our test database and the drop statements
+   * are not required so skipping the drop table statements etc makes it faster with less noise in the logs.
+   */
+  public boolean isDdlCreateOnly() {
+    return ddlCreateOnly;
+  }
+
+  /**
+   * Set to true if the "drop all ddl" should be skipped.
+   *
+   * Typically we want to do this when using H2 (in memory) as our test database and the drop statements
+   * are not required so skipping the drop table statements etc makes it faster with less noise in the logs.
+   */
+  public void setDdlCreateOnly(boolean ddlCreateOnly) {
+    this.ddlCreateOnly = ddlCreateOnly;
+  }
+
+  /**
+   * Return SQL script to execute after the "create all" DDL has been run.
+   * <p>
+   *   Typically this is a sql script that inserts test seed data when running tests.
+   *   Place a sql script in src/test/resources that inserts test seed data.
+   * </p>
+   */
+  public String getDdlSeedSql() {
+    return ddlSeedSql;
+  }
+
+  /**
+   * Set a SQL script to execute after the "create all" DDL has been run.
+   * <p>
+   *   Typically this is a sql script that inserts test seed data when running tests.
+   *   Place a sql script in src/test/resources that inserts test seed data.
+   * </p>
+   */
+  public void setDdlSeedSql(String ddlSeedSql) {
+    this.ddlSeedSql = ddlSeedSql;
+  }
+
+  /**
+   * Return a SQL script to execute before the "create all" DDL has been run.
+   */
+  public String getDdlInitSql() {
+    return ddlInitSql;
+  }
+
+  /**
+   * Set a SQL script to execute before the "create all" DDL has been run.
+   */
+  public void setDdlInitSql(String ddlInitSql) {
+    this.ddlInitSql = ddlInitSql;
+  }
+
   /**
    * Return true if the DDL should be generated.
    */
@@ -2232,6 +2300,9 @@ public class ServerConfig {
 
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
     ddlRun = p.getBoolean("ddl.run", ddlRun);
+    ddlCreateOnly = p.getBoolean("ddl.createOnly", ddlCreateOnly);
+    ddlInitSql = p.get("ddl.initSql", ddlInitSql);
+    ddlSeedSql = p.get("ddl.seedSql", ddlSeedSql);
 
     classes = getClasses(p);
   }

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

@@ -1,47 +1,43 @@
 package com.avaje.ebean.dbmigration;
 
-import com.avaje.ebean.Transaction;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.dbmigration.model.CurrentModel;
 import com.avaje.ebeaninternal.api.SpiEbeanPlugin;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.LineNumberReader;
-import java.io.StringReader;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
+import java.io.Reader;
 
 /**
- * Controls the generation of DDL and potentially runs the resulting scripts.
+ * Controls the generation and execution of "Create All" and "Drop All" DDL scripts.
+ *
+ * Typically the "Create All" DDL is executed for running tests etc and has nothing to do
+ * with DB Migration (diff based) DDL.
  */
-public class DdlGenerator implements SpiEbeanPlugin {
+public class DdlGenerator {
 
-  private static final Logger logger = LoggerFactory.getLogger(DdlGenerator.class);
+  private final SpiEbeanServer server;
 
-  private SpiEbeanServer server;
-
-  private boolean generateDdl;
-  private boolean runDdl;
+  private final boolean generateDdl;
+  private final boolean runDdl;
+  private final boolean createOnly;
 
   private CurrentModel currentModel;
   private String dropContent;
   private String createContent;
 
-  public void setup(SpiEbeanServer server, ServerConfig serverConfig) {
+  public DdlGenerator(SpiEbeanServer server, ServerConfig serverConfig) {
     this.server = server;
     this.generateDdl = serverConfig.isDdlGenerate();
     this.runDdl = serverConfig.isDdlRun();
+    this.createOnly = serverConfig.isDdlCreateOnly();
   }
 
   /**
@@ -58,9 +54,11 @@ public class DdlGenerator implements SpiEbeanPlugin {
   /**
    * Generate the DDL drop and create scripts if the properties have been set.
    */
-  public void generateDdl() {
+  protected void generateDdl() {
     if (generateDdl) {
-      writeDrop(getDropFileName());
+      if (!createOnly) {
+        writeDrop(getDropFileName());
+      }
       writeCreate(getCreateFileName());
     }
   }
@@ -68,18 +66,14 @@ public class DdlGenerator implements SpiEbeanPlugin {
   /**
    * Run the DDL drop and DDL create scripts if properties have been set.
    */
-  public void runDdl() {
+  protected void runDdl() {
 
     if (runDdl) {
       try {
-        if (dropContent == null) {
-          dropContent = readFile(getDropFileName());
-        }
-        if (createContent == null) {
-          createContent = readFile(getCreateFileName());
-        }
-        runScript(true, dropContent);
-        runScript(false, createContent);
+        runInitSql();
+        runDropSql();
+        runCreateSql();
+        runSeedSql();
 
       } catch (IOException e) {
         String msg = "Error reading drop/create script from file system";
@@ -88,6 +82,53 @@ public class DdlGenerator implements SpiEbeanPlugin {
     }
   }
 
+  protected void runDropSql() throws IOException {
+    if (!createOnly) {
+      if (dropContent == null) {
+        dropContent = readFile(getDropFileName());
+      }
+      runScript(true, dropContent, getDropFileName());
+    }
+  }
+
+  protected void runCreateSql() throws IOException {
+    if (createContent == null) {
+      createContent = readFile(getCreateFileName());
+    }
+    runScript(false, createContent, getCreateFileName());
+  }
+
+  protected void runInitSql() throws IOException {
+    runResourceScript(server.getServerConfig().getDdlInitSql());
+  }
+
+  protected void runSeedSql() throws IOException {
+    runResourceScript(server.getServerConfig().getDdlSeedSql());
+  }
+
+  protected void runResourceScript(String sqlScript) throws IOException {
+
+    if (sqlScript != null) {
+      InputStream is = getClassLoader().getResourceAsStream(sqlScript);
+      if (is != null) {
+        DdlRunner runner = new DdlRunner(false, sqlScript);
+        String content = readContent(new InputStreamReader(is));
+        runner.runAll(content, server);
+      }
+    }
+  }
+
+  /**
+   * Return the classLoader to use to read sql scripts as resources.
+   */
+  protected ClassLoader getClassLoader() {
+    ClassLoader cl = Thread.currentThread().getContextClassLoader();
+    if (cl == null) {
+      cl = this.getClassLoader();
+    }
+    return cl;
+  }
+
   protected void writeDrop(String dropFile) {
 
     try {
@@ -108,7 +149,7 @@ public class DdlGenerator implements SpiEbeanPlugin {
     }
   }
 
-  public String generateDropDdl() {
+  protected String generateDropDdl() {
 
     try {
       dropContent = currentModel().getDropDdl();
@@ -118,7 +159,7 @@ public class DdlGenerator implements SpiEbeanPlugin {
     }
   }
 
-  public String generateCreateDdl() {
+  protected String generateCreateDdl() {
 
     try {
       createContent = currentModel().getCreateDdl();
@@ -163,201 +204,33 @@ public class DdlGenerator implements SpiEbeanPlugin {
       return null;
     }
 
+    return readContent(new FileReader(f));
+  }
+
+  protected String readContent(Reader reader) throws IOException {
+
     StringBuilder buf = new StringBuilder();
 
-    FileReader fr = new FileReader(f);
-    LineNumberReader lr = new LineNumberReader(fr);
+    LineNumberReader lineReader = new LineNumberReader(reader);
     try {
       String s;
-      while ((s = lr.readLine()) != null) {
+      while ((s = lineReader.readLine()) != null) {
         buf.append(s).append("\n");
       }
-    } finally {
-      lr.close();
-    }
+      return buf.toString();
 
-    return buf.toString();
+    } finally {
+      lineReader.close();
+    }
   }
 
   /**
    * Execute all the DDL statements in the script.
    */
-  public void runScript(boolean expectErrors, String content) {
+  public int runScript(boolean expectErrors, String content, String scriptName) {
 
-    StringReader sr = new StringReader(content);
-    List<String> statements = parseStatements(sr);
-
-    Transaction t = server.createTransaction();
-    try {
-      Connection connection = t.getConnection();
-
-      logger.info("Running DDL");
-
-      runStatements(expectErrors, statements, connection);
-
-      logger.info("Running DDL Complete");
-
-      t.commit();
-
-    } catch (Exception e) {
-      throw new PersistenceException("Error: " + e.getMessage(), e);
-    } finally {
-      t.end();
-    }
+    DdlRunner runner = new DdlRunner(expectErrors, scriptName);
+    return runner.runAll(content, server);
   }
 
-  /**
-   * Execute the list of statements.
-   */
-  private void runStatements(boolean expectErrors, List<String> statements, Connection c) {
-    List<String> noDuplicates = new ArrayList<String>();
-
-    for (String statement : statements) {
-      if (!noDuplicates.contains(statement)) {
-        noDuplicates.add(statement);
-      }
-    }
-
-    for (int i = 0; i < noDuplicates.size(); i++) {
-      String xOfy = (i + 1) + " of " + noDuplicates.size();
-      runStatement(expectErrors, xOfy, noDuplicates.get(i), c);
-    }
-  }
-
-  /**
-   * Execute the statement.
-   */
-  private void runStatement(boolean expectErrors, String oneOf, String stmt, Connection c) {
-
-    PreparedStatement pstmt = null;
-    try {
-
-      // trim and remove trailing ; or /
-      stmt = stmt.trim();
-      if (stmt.endsWith(";")) {
-        stmt = stmt.substring(0, stmt.length() - 1);
-      } else if (stmt.endsWith("/")) {
-        stmt = stmt.substring(0, stmt.length() - 1);
-      }
-
-      logger.info("executing " + oneOf + " " + getSummary(stmt));
-
-      pstmt = c.prepareStatement(stmt);
-      pstmt.execute();
-
-    } catch (Exception e) {
-      if (expectErrors) {
-        logger.info(" ... ignoring error executing " + getSummary(stmt) + "  error: " + e.getMessage());
-      } else {
-        String msg = "Error executing stmt[" + stmt + "] error[" + e.getMessage() + "]";
-        throw new RuntimeException(msg, e);
-      }
-    } finally {
-      if (pstmt != null) {
-        try {
-          pstmt.close();
-        } catch (SQLException e) {
-          logger.error("Error closing pstmt", e);
-        }
-      }
-    }
-  }
-
-  /**
-   * Local utility used to detect the end of statements / separate statements.
-   * This is often just the semicolon character but for trigger/procedures this
-   * detects the $$ demarcation used in the history DDL generation for MySql and
-   * Postgres.
-   */
-  static class StatementsSeparator {
-
-    ArrayList<String> statements = new ArrayList<String>();
-
-    boolean trimDelimiter;
-
-    boolean inDbProcedure;
-
-    StringBuilder sb = new StringBuilder();
-
-    void lineContainsDollars(String line) {
-      if (inDbProcedure) {
-        if (trimDelimiter) {
-          line = line.replace("$$","");
-        }
-        endOfStatement(line);
-      } else {
-        // MySql style delimiter needs to be trimmed/removed
-        trimDelimiter = line.equals("delimiter $$");
-        if (!trimDelimiter) {
-          sb.append(line).append(" ");
-        }
-      }
-      inDbProcedure = !inDbProcedure;
-    }
-
-    void endOfStatement(String line) {
-      // end of Db procedure
-      sb.append(line);
-      statements.add(sb.toString().trim());
-      sb = new StringBuilder();
-    }
-
-    void nextLine(String line) {
-
-      if (line.contains("$$")) {
-        lineContainsDollars(line);
-        return;
-      }
-
-      if (inDbProcedure) {
-        sb.append(line).append(" ");
-        return;
-      }
-
-      int semiPos = line.indexOf(';');
-      if (semiPos == -1) {
-        sb.append(line).append(" ");
-
-      } else if (semiPos == line.length() - 1) {
-        // semicolon at end of line
-        endOfStatement(line);
-
-      } else {
-        // semicolon in middle of line
-        String preSemi = line.substring(0, semiPos);
-        endOfStatement(preSemi);
-        sb.append(line.substring(semiPos + 1));
-      }
-    }
-  }
-
-  /**
-   * Break up the sql in reader into a list of statements using the semi-colon
-   * character;
-   */
-  protected List<String> parseStatements(StringReader reader) {
-
-    try {
-      BufferedReader br = new BufferedReader(reader);
-      StatementsSeparator statements = new StatementsSeparator();
-
-      String s;
-      while ((s = br.readLine()) != null) {
-        s = s.trim();
-        statements.nextLine(s);
-      }
-
-      return statements.statements;
-
-    } catch (IOException e) {
-      throw new PersistenceException(e);
-    }
-  }
-
-  private String getSummary(String s) {
-    if (s.length() > 80) {
-      return s.substring(0, 80).trim() + "...";
-    }
-    return s;
-  }
 }

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

@@ -0,0 +1,110 @@
+package com.avaje.ebean.dbmigration;
+
+import javax.persistence.PersistenceException;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Parses string content into separate SQL/DDL statements.
+ */
+public class DdlParser {
+
+  /**
+   * Break up the sql in reader into a list of statements using the semi-colon and $$ delimiters;
+   */
+  public List<String> parse(StringReader reader) {
+
+    try {
+      BufferedReader br = new BufferedReader(reader);
+      StatementsSeparator statements = new StatementsSeparator();
+
+      String s;
+      while ((s = br.readLine()) != null) {
+        s = s.trim();
+        statements.nextLine(s);
+      }
+
+      return statements.statements;
+
+    } catch (IOException e) {
+      throw new PersistenceException(e);
+    }
+  }
+
+
+  /**
+   * Local utility used to detect the end of statements / separate statements.
+   * This is often just the semicolon character but for trigger/procedures this
+   * detects the $$ demarcation used in the history DDL generation for MySql and
+   * Postgres.
+   */
+  static class StatementsSeparator {
+
+    ArrayList<String> statements = new ArrayList<String>();
+
+    boolean trimDelimiter;
+
+    boolean inDbProcedure;
+
+    StringBuilder sb = new StringBuilder();
+
+    void lineContainsDollars(String line) {
+      if (inDbProcedure) {
+        if (trimDelimiter) {
+          line = line.replace("$$","");
+        }
+        endOfStatement(line);
+      } else {
+        // MySql style delimiter needs to be trimmed/removed
+        trimDelimiter = line.equals("delimiter $$");
+        if (!trimDelimiter) {
+          sb.append(line).append(" ");
+        }
+      }
+      inDbProcedure = !inDbProcedure;
+    }
+
+    void endOfStatement(String line) {
+      // end of Db procedure
+      sb.append(line);
+      statements.add(sb.toString().trim());
+      sb = new StringBuilder();
+    }
+
+    void nextLine(String line) {
+
+      if (line.contains("$$")) {
+        lineContainsDollars(line);
+        return;
+      }
+
+      if (sb.length() == 0 && (line.isEmpty() || line.startsWith("--"))) {
+        // ignore leading empty lines and sql comments
+        return;
+      }
+
+      if (inDbProcedure) {
+        sb.append(line).append(" ");
+        return;
+      }
+
+      int semiPos = line.indexOf(';');
+      if (semiPos == -1) {
+        sb.append(line).append(" ");
+
+      } else if (semiPos == line.length() - 1) {
+        // semicolon at end of line
+        endOfStatement(line);
+
+      } else {
+        // semicolon in middle of line
+        String preSemi = line.substring(0, semiPos);
+        endOfStatement(preSemi);
+        sb.append(line.substring(semiPos + 1));
+      }
+    }
+  }
+}

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

@@ -0,0 +1,138 @@
+package com.avaje.ebean.dbmigration;
+
+import com.avaje.ebean.Transaction;
+import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.PersistenceException;
+import java.io.StringReader;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Runs DDL scripts.
+ */
+public class DdlRunner {
+
+  protected static final Logger logger = LoggerFactory.getLogger(DdlRunner.class);
+
+  protected DdlParser ddlParser = new DdlParser();
+
+  protected final String scriptName;
+
+  protected final boolean expectErrors;
+
+  /**
+   * Construct with a script name (for logging) and flag indicating if errors are expected.
+   */
+  public DdlRunner(boolean expectErrors, String scriptName) {
+    this.expectErrors = expectErrors;
+    this.scriptName = scriptName;
+  }
+
+  /**
+   * Parse the content into sql statements and execute them in a transaction.
+   */
+  public int runAll(String content, SpiEbeanServer server) {
+
+    List<String> statements = ddlParser.parse(new StringReader(content));
+    return runStatements(statements, server);
+  }
+
+  /**
+   * Execute all the statements in a single transaction.
+   */
+  public int runStatements(List<String> statements, SpiEbeanServer server) {
+
+    Transaction t = server.createTransaction();
+    try {
+      int statementCount = runStatements(expectErrors, statements, t.getConnection());
+      t.commit();
+
+      return statementCount;
+
+    } catch (Exception e) {
+      throw new PersistenceException("Error: " + e.getMessage(), e);
+
+    } finally {
+      t.end();
+    }
+  }
+
+  /**
+   * Execute the list of statements.
+   */
+  private int runStatements(boolean expectErrors, List<String> statements, Connection c) {
+
+    List<String> noDuplicates = new ArrayList<String>();
+
+    for (String statement : statements) {
+      if (!noDuplicates.contains(statement)) {
+        noDuplicates.add(statement);
+      }
+    }
+
+    logger.info("Executing {} - {} statements", scriptName, noDuplicates.size());
+
+    for (int i = 0; i < noDuplicates.size(); i++) {
+      String xOfy = (i + 1) + " of " + noDuplicates.size();
+      runStatement(expectErrors, xOfy, noDuplicates.get(i), c);
+    }
+
+    return noDuplicates.size();
+  }
+
+  /**
+   * Execute the statement.
+   */
+  private void runStatement(boolean expectErrors, String oneOf, String stmt, Connection c) {
+
+    PreparedStatement pstmt = null;
+    try {
+
+      // trim and remove trailing ; or /
+      stmt = stmt.trim();
+      if (stmt.endsWith(";")) {
+        stmt = stmt.substring(0, stmt.length() - 1);
+      } else if (stmt.endsWith("/")) {
+        stmt = stmt.substring(0, stmt.length() - 1);
+      }
+
+      if (logger.isDebugEnabled()) {
+        logger.debug("executing " + oneOf + " " + getSummary(stmt));
+      }
+
+      pstmt = c.prepareStatement(stmt);
+      pstmt.execute();
+
+    } catch (Exception e) {
+      if (expectErrors) {
+        logger.debug(" ... ignoring error executing " + getSummary(stmt) + "  error: " + e.getMessage());
+      } else {
+        String msg = "Error executing stmt[" + stmt + "] error[" + e.getMessage() + "]";
+        throw new RuntimeException(msg, e);
+      }
+
+    } finally {
+      if (pstmt != null) {
+        try {
+          pstmt.close();
+        } catch (SQLException e) {
+          logger.error("Error closing pstmt", e);
+        }
+      }
+    }
+  }
+
+  private String getSummary(String s) {
+    if (s.length() > 80) {
+      return s.substring(0, 80).trim() + "...";
+    }
+    return s;
+  }
+
+}

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

@@ -14,7 +14,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
 
 
   public PostgresHistoryDdl() {
-    this.currentTimestamp = "current_timestamp";
+    this.currentTimestamp = "statement_timestamp()";
   }
 
   /**
@@ -80,7 +80,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
         .append("  if (TG_OP = 'UPDATE') then").newLine();
     appendInsertIntoHistory(apply, historyTable, includedColumns);
     apply
-        .append("    NEW.").append(sysPeriod).append(" = tstzrange(CURRENT_TIMESTAMP,null);").newLine()
+        .append("    NEW.").append(sysPeriod).append(" = tstzrange(").append(currentTimestamp).append(",null);").newLine()
         .append("    return new;").newLine();
     apply
         .append("  elsif (TG_OP = 'DELETE') then").newLine();
@@ -137,7 +137,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl {
 
     buffer.append("    insert into ").append(historyTable).append(" (").append(sysPeriod).append(",");
     appendColumnNames(buffer, columns, "");
-    buffer.append(") values (tstzrange(lower(OLD.").append(sysPeriod).append("), current_timestamp), ");
+    buffer.append(") values (tstzrange(lower(OLD.").append(sysPeriod).append("), ").append(currentTimestamp).append("), ");
     appendColumnNames(buffer, columns, "OLD.");
     buffer.append(");").newLine();
   }

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

@@ -43,6 +43,10 @@ public class ModelBuildContext {
     model.adjustDraftReferences();
   }
 
+  public String normaliseTable(String baseTable) {
+    return constraintNaming.normaliseTable(baseTable);
+  }
+
   public String primaryKeyName(String tableName) {
     return maxLength(constraintNaming.primaryKeyName(tableName), 0);
   }

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

@@ -64,8 +64,7 @@ public class ModelBuildIntersectionTable {
 	private void buildFkConstraints(BeanDescriptor<?> desc, TableJoinColumn[] columns, boolean direction) {
 
     String tableName = intersectionTableJoin.getTable();
-    String baseTable = desc.getBaseTable();
-
+    String baseTable = ctx.normaliseTable(desc.getBaseTable());
     String fkName = ctx.foreignKeyConstraintName(tableName, baseTable, ++countForeignKey);
     String fkIndex = ctx.foreignKeyIndexName(tableName, baseTable, countForeignKey);
 

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

@@ -23,7 +23,7 @@ public class ClassUtil {
   /**
    * Load a class taking into account a context class loader (if present).
    */
-  private static Class<?> forName(String name) throws ClassNotFoundException {
+  public static Class<?> forName(String name) throws ClassNotFoundException {
     return new ClassLoadContext().forName(name);
   }
 

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

@@ -1,18 +1,27 @@
 package com.avaje.ebeaninternal.api;
 
-import java.util.List;
-
+import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.bean.EntityBeanIntercept;
 import com.avaje.ebeaninternal.server.core.OrmQueryRequest;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Request for loading ManyToOne and OneToOne relationships.
  */
 public class LoadBeanRequest extends LoadRequest {
 
+  private static final Logger logger = LoggerFactory.getLogger(LoadBeanRequest.class);
+
   private final List<EntityBeanIntercept> batch;
 
-  private final LoadBeanBuffer LoadBuffer;
+  private final LoadBeanBuffer loadBuffer;
+
+  private final int lazyLoadPropertyIndex;
 
   private final String lazyLoadProperty;
 
@@ -21,31 +30,40 @@ public class LoadBeanRequest extends LoadRequest {
   /**
    * Construct for lazy load request.
    */
-  public LoadBeanRequest(LoadBeanBuffer LoadBuffer, String lazyLoadProperty, boolean loadCache) {
-    this(LoadBuffer, null, true, lazyLoadProperty, loadCache);
+  public LoadBeanRequest(LoadBeanBuffer LoadBuffer, int lazyLoadPropertyIndex, String lazyLoadProperty, boolean loadCache) {
+    this(LoadBuffer, null, true, lazyLoadPropertyIndex, lazyLoadProperty, loadCache);
   }
 
   /**
    * Construct for secondary query.
    */
   public LoadBeanRequest(LoadBeanBuffer LoadBuffer, OrmQueryRequest<?> parentRequest) {
-    this(LoadBuffer, parentRequest, false, null, false);
+    this(LoadBuffer, parentRequest, false, -1, null, false);
   }
 
-  private LoadBeanRequest(LoadBeanBuffer LoadBuffer, OrmQueryRequest<?> parentRequest, boolean lazy, String lazyLoadProperty, boolean loadCache) {
+  private LoadBeanRequest(LoadBeanBuffer loadBuffer, OrmQueryRequest<?> parentRequest, boolean lazy,
+                          int lazyLoadPropertyIndex, String lazyLoadProperty, boolean loadCache) {
+
     super(parentRequest, lazy);
-    this.LoadBuffer = LoadBuffer;
-    this.batch = LoadBuffer.getBatch();
+    this.loadBuffer = loadBuffer;
+    this.batch = loadBuffer.getBatch();
+    this.lazyLoadPropertyIndex = lazyLoadPropertyIndex;
     this.lazyLoadProperty = lazyLoadProperty;
     this.loadCache = loadCache;
   }
 
+  @Override
+  public Class<?> getBeanType() {
+    return loadBuffer.getBeanDescriptor().getBeanType();
+  }
+
   public boolean isLoadCache() {
     return loadCache;
   }
 
+
   public String getDescription() {
-    return "path:" + LoadBuffer.getFullPath() + " batch:" + batch.size();
+    return "path:" + loadBuffer.getFullPath() + " batch:" + batch.size();
   }
 
   /**
@@ -59,7 +77,7 @@ public class LoadBeanRequest extends LoadRequest {
    * Return the load context.
    */
   public LoadBeanBuffer getLoadContext() {
-    return LoadBuffer;
+    return loadBuffer;
   }
 
   /**
@@ -72,4 +90,82 @@ public class LoadBeanRequest extends LoadRequest {
   public int getBatchSize() {
     return getLoadContext().getBatchSize();
   }
+
+  /**
+   * Return the list of Id values for the beans in the lazy load buffer.
+   */
+  public List<Object> getIdList(int batchSize) {
+
+    ArrayList<Object> idList = new ArrayList<Object>(batchSize);
+
+    BeanDescriptor<?> desc = loadBuffer.getBeanDescriptor();
+    for (int i = 0; i < batch.size(); i++) {
+      EntityBeanIntercept ebi = batch.get(i);
+      EntityBean bean = ebi.getOwner();
+      idList.add(desc.getId(bean));
+    }
+
+    if (!idList.isEmpty()) {
+      int extraIds = batchSize - batch.size();
+      if (extraIds > 0) {
+        // for performance make up the Id's to the batch size
+        // so we get the same query (for Ebean and the db)
+        Object firstId = idList.get(0);
+        for (int i = 0; i < extraIds; i++) {
+          // just add the first Id again
+          idList.add(firstId);
+        }
+      }
+    }
+
+    return idList;
+  }
+
+  /**
+   * Configure the query for lazy loading execution.
+   */
+  public void configureQuery(SpiQuery<?> query) {
+
+    query.setMode(SpiQuery.Mode.LAZYLOAD_BEAN);
+    query.setPersistenceContext(loadBuffer.getPersistenceContext());
+
+    String mode = isLazy() ? "+lazy" : "+query";
+    query.setLoadDescription(mode, getDescription());
+
+    if (isLazy()) {
+      // cascade the batch size (if set) for further lazy loading
+      query.setLazyLoadBatchSize(getBatchSize());
+    }
+
+    loadBuffer.configureQuery(query, getLazyLoadProperty());
+  }
+
+  /**
+   * Load the beans into the L2 cache if that is requested and check for load failures due to deletes.
+   */
+  public void postLoad(List<?> list) {
+
+    if (isLoadCache()) {
+      BeanDescriptor<?> desc = loadBuffer.getBeanDescriptor();
+      for (int i = 0; i < list.size(); i++) {
+        desc.cacheBeanPutData((EntityBean) list.get(i));
+      }
+    }
+
+    if (lazyLoadPropertyIndex > -1) {
+      // this is a lazy loading query so check for lazy loading failure (due to deleted rows)
+      for (int i = 0; i < batch.size(); i++) {
+        // check if the underlying row in DB was deleted. Mark the bean as 'failed' if
+        // necessary but allow processing to continue until it is accessed by client code
+        EntityBeanIntercept ebi = batch.get(i);
+        // all beans in the batch should have this property loaded now
+        if (ebi.isLazyLoadFailure(lazyLoadPropertyIndex)) {
+          BeanDescriptor<?> desc = loadBuffer.getBeanDescriptor();
+          Object beanId = desc.getId(ebi.getOwner());
+          ebi.setOwnerId(beanId);
+          logger.info("Lazy loading unsuccessful for type:" + desc.getName() + " id:" + beanId + " - expecting when bean has been deleted");
+        }
+      }
+    }
+  }
 }

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

@@ -1,15 +1,25 @@
 package com.avaje.ebeaninternal.api;
 
-import java.util.List;
-
+import com.avaje.ebean.EbeanServer;
 import com.avaje.ebean.bean.BeanCollection;
+import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebeaninternal.server.core.OrmQueryRequest;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
+import com.avaje.ebeaninternal.server.lib.util.StringHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Request for loading Associated Many Beans.
  */
 public class LoadManyRequest extends LoadRequest {
 
+  private static final Logger logger = LoggerFactory.getLogger(LoadManyRequest.class);
+
   private final List<BeanCollection<?>> batch;
 
   private final LoadManyBuffer loadContext;
@@ -40,6 +50,11 @@ public class LoadManyRequest extends LoadRequest {
     this.loadCache = loadCache;
   }
 
+  @Override
+  public Class<?> getBeanType() {
+    return loadContext.getBeanDescriptor().getBeanType();
+  }
+
   public String getDescription() {
     return "path:" + loadContext.getFullPath() + " size:" + batch.size();
   }
@@ -83,4 +98,98 @@ public class LoadManyRequest extends LoadRequest {
   public int getBatchSize() {
     return loadContext.getBatchSize();
   }
+
+  private List<Object> getParentIdList(int batchSize) {
+
+    ArrayList<Object> idList = new ArrayList<Object>(batchSize);
+
+    BeanPropertyAssocMany<?> many = getMany();
+    for (int i = 0; i < batch.size(); i++) {
+      BeanCollection<?> bc = batch.get(i);
+      idList.add(many.getParentId(bc.getOwnerBean()));
+    }
+    int extraIds = batchSize - batch.size();
+    if (extraIds > 0) {
+      Object firstId = idList.get(0);
+      for (int i = 0; i < extraIds; i++) {
+        idList.add(firstId);
+      }
+    }
+
+    return idList;
+  }
+
+  private BeanPropertyAssocMany<?> getMany() {
+    return loadContext.getBeanProperty();
+  }
+
+  public SpiQuery<?> createQuery(EbeanServer server, int batchSize) {
+
+    BeanPropertyAssocMany<?> many = getMany();
+
+    SpiQuery<?> query = (SpiQuery<?>) server.createQuery(many.getTargetType());
+    String orderBy = many.getLazyFetchOrderBy();
+    if (orderBy != null) {
+      query.orderBy(orderBy);
+    }
+
+    String extraWhere = many.getExtraWhere();
+    if (extraWhere != null) {
+      // replace special ${ta} placeholder with the base table alias
+      // which is always t0 and add the extra where clause
+      String ew = StringHelper.replaceString(extraWhere, "${ta}", "t0");
+      query.where().raw(ew);
+    }
+
+    query.setLazyLoadForParents(many);
+
+    List<Object> idList = getParentIdList(batchSize);
+    many.addWhereParentIdIn(query, idList);
+
+    query.setPersistenceContext(loadContext.getPersistenceContext());
+
+    String mode = isLazy() ? "+lazy" : "+query";
+    query.setLoadDescription(mode, getDescription());
+
+    if (isLazy()) {
+      // cascade the batch size (if set) for further lazy loading
+      query.setLazyLoadBatchSize(getBatchSize());
+    }
+
+    // potentially changes the joins and selected properties
+    loadContext.configureQuery(query);
+
+    if (isOnlyIds()) {
+      // override to just select the Id values
+      query.select(many.getTargetIdProperty());
+    }
+
+    return query;
+  }
+
+  /**
+   * After the query execution check for empty collections and load L2 cache if desired.
+   */
+  public void postLoad() {
+
+    BeanDescriptor<?> desc = loadContext.getBeanDescriptor();
+    BeanPropertyAssocMany<?> many = getMany();
+
+    // check for BeanCollection's that where never processed
+    // in the +query or +lazy load due to no rows (predicates)
+    for (int i = 0; i < batch.size(); i++) {
+      BeanCollection<?> bc = batch.get(i);
+      if (bc.checkEmptyLazyLoad()) {
+        if (logger.isDebugEnabled()) {
+          EntityBean ownerBean = bc.getOwnerBean();
+          Object parentId = desc.getId(ownerBean);
+          logger.debug("BeanCollection after lazy load was empty. type:" + ownerBean.getClass().getName() + " id:" + parentId + " owner:" + ownerBean);
+        }
+      } else if (isLoadCache()) {
+        Object parentId = desc.getId(bc.getOwnerBean());
+        desc.cacheManyPropPut(many, bc, parentId);
+      }
+    }
+
+  }
 }

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

@@ -21,6 +21,11 @@ public abstract class LoadRequest {
 		this.lazy = lazy;
 	}
 
+  /**
+   * Return the associated bean type for this load request.
+   */
+  public abstract Class<?> getBeanType();
+
   /**
    * Log the just executed secondary query with the 'root' query if 'logSecondaryQuery' is set to
    * true. This is for testing purposes to confirm the secondary query executes etc.

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

@@ -1,153 +1,153 @@
 package com.avaje.ebeaninternal.api;
 
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
 import com.avaje.ebeaninternal.server.deploy.BeanProperty;
 import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import com.avaje.ebeaninternal.server.el.ElPropertyDeploy;
 import com.avaje.ebeaninternal.server.query.SplitName;
 import com.avaje.ebeaninternal.server.query.SqlJoinType;
 
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
 /**
  * Holds the joins needs to support the many where predicates.
  * These joins are independent of any 'fetch' joins on the many.
  */
 public class ManyWhereJoins implements Serializable {
 
-    private static final long serialVersionUID = -6490181101871795417L;
-    
-    private final TreeMap<String,PropertyJoin> joins = new TreeMap<String,PropertyJoin>();
+  private static final long serialVersionUID = -6490181101871795417L;
 
-    private StringBuilder formulaProperties = new StringBuilder();
-    
-    private boolean formulaWithJoin;
+  private final TreeMap<String, PropertyJoin> joins = new TreeMap<String, PropertyJoin>();
+
+  private StringBuilder formulaProperties = new StringBuilder();
+
+  private boolean formulaWithJoin;
 
   /**
    * 'Mode' indicating that joins added while this is true are required to be outer joins.
    */
-    private boolean requireOuterJoins;
-    
-    /**
-     * Return the current 'mode' indicating if outer joins are currently required or not.
-     */
-    public boolean isRequireOuterJoins() {
-      return requireOuterJoins;
-    }
+  private boolean requireOuterJoins;
 
-    /**
-     * Set the 'mode' to be that joins added are required to be outer joins.
-     * This is set during the evaluation of disjunction predicates.
-     */
-    public void setRequireOuterJoins(boolean requireOuterJoins) {
-      this.requireOuterJoins = requireOuterJoins;
-    }
+  /**
+   * Return the current 'mode' indicating if outer joins are currently required or not.
+   */
+  public boolean isRequireOuterJoins() {
+    return requireOuterJoins;
+  }
 
-    /**
-     * Add a many where join.
-     */
-    public void add(ElPropertyDeploy elProp) {
-        
-        String join = elProp.getElPrefix();
-        BeanProperty p = elProp.getBeanProperty();
-        if (p instanceof BeanPropertyAssocMany<?>){
-            join = addManyToJoin(join, p.getName());          
-        }
-        if (join != null){
-            addJoin(join);
-            if (p != null) {
-              String secondaryTableJoinPrefix = p.getSecondaryTableJoinPrefix();
-              if (secondaryTableJoinPrefix != null) {
-                addJoin(join+"."+secondaryTableJoinPrefix);
-              }
-            }
-            addParentJoins(join);
-        }
-    }
-    
-    /**
-     * For 'many' properties we also need to add the name of the 
-     * many property to get the full logical name of the join.
-     */
-    private String addManyToJoin(String join, String manyPropName){
-        if (join == null){
-            return manyPropName;
-        } else {
-            return join+"."+manyPropName;
-        }
-    }
-    
-    private void addParentJoins(String join) {
-        String[] split = SplitName.split(join);
-        if (split[0] != null){
-            addJoin(split[0]);
-            addParentJoins(split[0]);
-        }
-    }
+  /**
+   * Set the 'mode' to be that joins added are required to be outer joins.
+   * This is set during the evaluation of disjunction predicates.
+   */
+  public void setRequireOuterJoins(boolean requireOuterJoins) {
+    this.requireOuterJoins = requireOuterJoins;
+  }
 
-    private void addJoin(String property) {
-      SqlJoinType joinType = (requireOuterJoins) ? SqlJoinType.OUTER: SqlJoinType.INNER; 
-      joins.put(property, new PropertyJoin(property, joinType));
-    }
-    
-    /**
-     * Return true if there are no extra many where joins.
-     */
-    public boolean isEmpty() {
-        return joins.isEmpty();
-    }
-    
-    /**
-     * Return the set of many where joins.
-     */
-    public Collection<PropertyJoin> getPropertyJoins() {
-        return joins.values();
-    }
+  /**
+   * Add a many where join.
+   */
+  public void add(ElPropertyDeploy elProp) {
 
-    /**
-     * Return the set of property names for the many where joins.
-     */
-    public TreeSet<String> getPropertyNames() {
-      
-      TreeSet<String> propertyNames = new TreeSet<String>();
-      for (PropertyJoin join : joins.values()) {
-        propertyNames.add(join.getProperty());
+    String join = elProp.getElPrefix();
+    BeanProperty p = elProp.getBeanProperty();
+    if (p instanceof BeanPropertyAssocMany<?>) {
+      join = addManyToJoin(join, p.getName());
+    }
+    if (join != null) {
+      addJoin(join);
+      if (p != null) {
+        String secondaryTableJoinPrefix = p.getSecondaryTableJoinPrefix();
+        if (secondaryTableJoinPrefix != null) {
+          addJoin(join + "." + secondaryTableJoinPrefix);
+        }
       }
-      return propertyNames;
+      addParentJoins(join);
     }
+  }
 
-    /**
-     * In findRowCount query found a formula property with a join clause so building a select clause
-     * specifically for the findRowCount query.
-     */
-    public void addFormulaWithJoin(String propertyName) {
-      if (formulaWithJoin) {
-        formulaProperties.append(",");
-      } else {
-        formulaProperties = new StringBuilder();
-        formulaWithJoin = true;
-      }
-      formulaProperties.append(propertyName);
+  /**
+   * For 'many' properties we also need to add the name of the
+   * many property to get the full logical name of the join.
+   */
+  private String addManyToJoin(String join, String manyPropName) {
+    if (join == null) {
+      return manyPropName;
+    } else {
+      return join + "." + manyPropName;
     }
-    
-    public boolean isHasMany() {
-      return formulaWithJoin || !joins.isEmpty();
+  }
+
+  private void addParentJoins(String join) {
+    String[] split = SplitName.split(join);
+    if (split[0] != null) {
+      addJoin(split[0]);
+      addParentJoins(split[0]);
     }
-    
-    /**
-     * Return true if the findRowCount query just needs the id property in the select clause.
-     */
-    public boolean isSelectId() {
-      return !formulaWithJoin;
+  }
+
+  private void addJoin(String property) {
+    SqlJoinType joinType = (requireOuterJoins) ? SqlJoinType.OUTER : SqlJoinType.INNER;
+    joins.put(property, new PropertyJoin(property, joinType));
+  }
+
+  /**
+   * Return true if there are no extra many where joins.
+   */
+  public boolean isEmpty() {
+    return joins.isEmpty();
+  }
+
+  /**
+   * Return the set of many where joins.
+   */
+  public Collection<PropertyJoin> getPropertyJoins() {
+    return joins.values();
+  }
+
+  /**
+   * Return the set of property names for the many where joins.
+   */
+  public TreeSet<String> getPropertyNames() {
+
+    TreeSet<String> propertyNames = new TreeSet<String>();
+    for (PropertyJoin join : joins.values()) {
+      propertyNames.add(join.getProperty());
     }
-    
-    /**
-     * Return the formula properties to build the select clause for a findRowCount query.
-     */
-    public String getFormulaProperties() {
-      return formulaProperties.toString();
+    return propertyNames;
+  }
+
+  /**
+   * In findRowCount query found a formula property with a join clause so building a select clause
+   * specifically for the findRowCount query.
+   */
+  public void addFormulaWithJoin(String propertyName) {
+    if (formulaWithJoin) {
+      formulaProperties.append(",");
+    } else {
+      formulaProperties = new StringBuilder();
+      formulaWithJoin = true;
     }
+    formulaProperties.append(propertyName);
+  }
+
+  public boolean isHasMany() {
+    return formulaWithJoin || !joins.isEmpty();
+  }
+
+  /**
+   * Return true if the findRowCount query just needs the id property in the select clause.
+   */
+  public boolean isSelectId() {
+    return !formulaWithJoin;
+  }
+
+  /**
+   * Return the formula properties to build the select clause for a findRowCount query.
+   */
+  public String getFormulaProperties() {
+    return formulaProperties.toString();
+  }
 
 }

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

@@ -7,6 +7,7 @@ import com.avaje.ebean.config.ServerConfig;
  *
  * author: Richard Vowles - http://gplus.to/RichardVowles
  */
+@Deprecated
 public interface SpiEbeanPlugin {
 
   /**

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

@@ -66,11 +66,6 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    */
   PersistenceContextScope getPersistenceContextScope(SpiQuery<?> query);
 
-  /**
-   * Return the DDL generator.
-   */
-  DdlGenerator getDdlGenerator();
-
   /**
    * Clear the query execution statistics.
    */

src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneAllCollection.java

@@ -0,0 +1,61 @@
+package com.avaje.ebeaninternal.server.autotune.service;
+
+import com.avaje.ebeaninternal.server.autotune.model.Autotune;
+
+import java.util.Collection;
+
+/**
+ * Event where all tuned query information is collected.
+ * <p>
+ *  This is for writing the "all" file on shutdown when using runtime tuning.
+ * </p>
+ */
+public class AutoTuneAllCollection {
+
+  final Autotune document = new Autotune();
+
+  final BaseQueryTuner queryTuner;
+
+  /**
+   * Construct to collect/report all tuned queries.
+   */
+  public AutoTuneAllCollection(BaseQueryTuner queryTuner) {
+    this.queryTuner = queryTuner;
+    loadAllTuned();
+  }
+
+  /**
+   * Return the number of origin elements in the document.
+   */
+  public int size() {
+    return document.getOrigin().size();
+  }
+
+  /**
+   * Return the Autotune document object.
+   */
+  public Autotune getDocument() {
+    return document;
+  }
+
+  /**
+   * Write the document as an xml file.
+   */
+  public void writeFile(String filePrefix) {
+
+    AutoTuneXmlWriter writer = new AutoTuneXmlWriter();
+    writer.write(document, filePrefix);
+  }
+
+  /**
+   * Loads all the existing query tuning into the document.
+   */
+  private void loadAllTuned() {
+
+    Collection<TunedQueryInfo> all = queryTuner.getAll();
+    for (TunedQueryInfo tuned: all) {
+      document.getOrigin().add(tuned.getOrigin());
+    }
+  }
+
+}

src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneDiffCollection.java

@@ -0,0 +1,162 @@
+package com.avaje.ebeaninternal.server.autotune.service;
+
+import com.avaje.ebean.bean.ObjectGraphOrigin;
+import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection;
+import com.avaje.ebeaninternal.server.autotune.model.Autotune;
+import com.avaje.ebeaninternal.server.autotune.model.Origin;
+import com.avaje.ebeaninternal.server.autotune.model.ProfileDiff;
+import com.avaje.ebeaninternal.server.autotune.model.ProfileNew;
+import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
+
+/**
+ * Event where profiling information is collected and processed for differences
+ * relative to the current query tuning.
+ */
+public class AutoTuneDiffCollection {
+
+  final Autotune document = new Autotune();
+
+  final AutoTuneCollection profiling;
+
+  final BaseQueryTuner queryTuner;
+
+  final boolean updateTuning;
+
+  int newCount;
+
+  int diffCount;
+
+  /**
+   * Construct to collect/report the new/diff query tuning entries.
+   */
+  public AutoTuneDiffCollection(AutoTuneCollection profiling, BaseQueryTuner queryTuner, boolean updateTuning) {
+    this.profiling = profiling;
+    this.queryTuner = queryTuner;
+    this.updateTuning = updateTuning;
+  }
+
+  /**
+   * Return true if there are no new or diff entries.
+   */
+  public boolean isEmpty() {
+    return newCount == 0 && diffCount == 0;
+  }
+
+  /**
+   * Return the underlying Autotune document object.
+   */
+  public Autotune getDocument() {
+    return document;
+  }
+
+  /**
+   * Return the number of diff entries.
+   */
+  public int getDiffCount() {
+    return diffCount;
+  }
+
+  /**
+   * Return the number of new entries.
+   */
+  public int getNewCount() {
+    return newCount;
+  }
+
+  /**
+   * Return the total new and diff entries.
+   */
+  public int getChangeCount() {
+    return newCount + diffCount;
+  }
+
+  /**
+   * Write the underlying document as an xml file.
+   */
+  public void writeFile(String filePrefix) {
+
+    AutoTuneXmlWriter writer = new AutoTuneXmlWriter();
+    writer.write(document, filePrefix);
+  }
+
+  /**
+   * Process checking profiling entries against existing query tuning.
+   */
+  public void process() {
+
+    for (AutoTuneCollection.Entry entry : profiling.getEntries()) {
+      addToDocument(entry);
+    }
+  }
+
+  /**
+   * Check if the entry is new or diff and add as necessary.
+   */
+  private void addToDocument(AutoTuneCollection.Entry entry) {
+
+    ObjectGraphOrigin point = entry.getOrigin();
+    OrmQueryDetail profileDetail = entry.getDetail();
+
+    // compare with the existing query tuning entry
+    OrmQueryDetail tuneDetail = queryTuner.get(point.getKey());
+    if (tuneDetail == null) {
+      addToDocumentNewEntry(entry, point);
+
+    } else if (!tuneDetail.isAutoTuneEqual(profileDetail)) {
+      addToDocumentDiffEntry(entry, point, tuneDetail);
+    }
+  }
+
+  /**
+   * Add as a diff entry.
+   */
+  private void addToDocumentDiffEntry(AutoTuneCollection.Entry entry, ObjectGraphOrigin point, OrmQueryDetail tuneDetail) {
+
+    diffCount++;
+
+    Origin origin = createOrigin(entry, point, tuneDetail.toString());
+    ProfileDiff diff = document.getProfileDiff();
+    if (diff == null) {
+      diff = new ProfileDiff();
+      document.setProfileDiff(diff);
+    }
+    diff.getOrigin().add(origin);
+  }
+
+  /**
+   * Add as a "new" entry.
+   */
+  private void addToDocumentNewEntry(AutoTuneCollection.Entry entry, ObjectGraphOrigin point) {
+
+    newCount++;
+
+    ProfileNew profileNew = document.getProfileNew();
+    if (profileNew == null) {
+      profileNew = new ProfileNew();
+      document.setProfileNew(profileNew);
+    }
+    Origin origin = createOrigin(entry, point, entry.getOriginalQuery());
+    profileNew.getOrigin().add(origin);
+  }
+
+
+  /**
+   * Create the XML Origin bean for the given entry and ObjectGraphOrigin.
+   */
+  private Origin createOrigin(AutoTuneCollection.Entry entry, ObjectGraphOrigin point, String query) {
+
+    Origin origin = new Origin();
+    origin.setKey(point.getKey());
+    origin.setBeanType(point.getBeanType());
+    origin.setDetail(entry.getDetail().toString());
+    origin.setCallStack(point.getCallStack().description("\n"));
+    origin.setOriginal(query);
+
+    if (updateTuning) {
+      queryTuner.put(origin);
+    }
+
+    return origin;
+  }
+
+}

src/main/java/com/avaje/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java

@@ -7,12 +7,29 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * Simple writer for output of the AutoTune Profiling as an XML document.
  */
 public class AutoTuneXmlWriter {
 
+  /**
+   * Write the document as xml file with the given prefix.
+   */
+  public void write(Autotune document, String filePrefix) {
+
+    SortAutoTuneDocument.sort(document);
+
+    SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd-HHmmss");
+    String now = df.format(new Date());
+
+    // write the file with serverName and now suffix as we can output the profiling many times
+    File file = new File(filePrefix + "-" + now + ".xml");
+    write(document, file);
+  }
+
   /**
    * Write Profiling to a file as xml.
    */

src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java

@@ -7,9 +7,11 @@ import com.avaje.ebean.config.AutoTuneMode;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
 import com.avaje.ebeaninternal.api.SpiQuery;
 import com.avaje.ebeaninternal.server.autotune.ProfilingListener;
+import com.avaje.ebeaninternal.server.autotune.model.Origin;
 import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
 
 import javax.persistence.PersistenceException;
+import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -48,6 +50,21 @@ public class BaseQueryTuner {
     this.skipAll = !queryTuning && !profiling;
   }
 
+  /**
+   * Return all the current tuned query entries.
+   */
+  public Collection<TunedQueryInfo> getAll() {
+    return tunedQueryInfoMap.values();
+  }
+
+  /**
+   * Put a query tuning entry.
+   */
+  public void put(Origin origin) {
+
+    tunedQueryInfoMap.put(origin.getKey(), new TunedQueryInfo(origin));
+  }
+
   /**
    * Load the tuned query information.
    */

src/main/java/com/avaje/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java

@@ -1,6 +1,5 @@
 package com.avaje.ebeaninternal.server.autotune.service;
 
-import com.avaje.ebean.bean.ObjectGraphOrigin;
 import com.avaje.ebean.config.AutoTuneConfig;
 import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
@@ -9,24 +8,11 @@ import com.avaje.ebeaninternal.server.autotune.AutoTuneCollection;
 import com.avaje.ebeaninternal.server.autotune.AutoTuneService;
 import com.avaje.ebeaninternal.server.autotune.model.Autotune;
 import com.avaje.ebeaninternal.server.autotune.model.Origin;
-import com.avaje.ebeaninternal.server.autotune.model.ProfileDiff;
-import com.avaje.ebeaninternal.server.autotune.model.ProfileEmpty;
-import com.avaje.ebeaninternal.server.autotune.model.ProfileNew;
-import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
-import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetailParser;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Implementation of the AutoTuneService which is comprised of profiling and query tuning.
@@ -35,9 +21,13 @@ public class DefaultAutoTuneService implements AutoTuneService {
 
   private static final Logger logger = LoggerFactory.getLogger(DefaultAutoTuneService.class);
 
+  private final SpiEbeanServer server;
+
   private final long defaultGarbageCollectionWait;
 
-  private final boolean skipCollectionOnShutdown;
+  private final boolean skipGarbageCollectionOnShutdown;
+
+  private final boolean skipProfileReportingOnShutdown;
 
   private final BaseQueryTuner queryTuner;
 
@@ -53,18 +43,25 @@ public class DefaultAutoTuneService implements AutoTuneService {
 
   private final String serverName;
 
+  private final int profilingUpdateFrequency;
+
+  private long runtimeChangeCount;
+
   public DefaultAutoTuneService(SpiEbeanServer server, ServerConfig serverConfig) {
 
     AutoTuneConfig config = serverConfig.getAutoTuneConfig();
 
+    this.server = server;
     this.queryTuning = config.isQueryTuning();
     this.profiling = config.isProfiling();
     this.tuningFile = config.getQueryTuningFile();
     this.profilingFile = config.getProfilingFile();
+    this.profilingUpdateFrequency = config.getProfilingUpdateFrequency();
     this.serverName = server.getName();
     this.profileManager = new ProfileManager(config, server);
     this.queryTuner = new BaseQueryTuner(config, server, profileManager);
-    this.skipCollectionOnShutdown = config.isSkipCollectionOnShutdown();
+    this.skipGarbageCollectionOnShutdown = config.isSkipGarbageCollectionOnShutdown();
+    this.skipProfileReportingOnShutdown = config.isSkipProfileReportingOnShutdown();
     this.defaultGarbageCollectionWait = (long) config.getGarbageCollectionWait();
   }
 
@@ -75,169 +72,122 @@ public class DefaultAutoTuneService implements AutoTuneService {
   public void startup() {
 
     if (queryTuning) {
-      File file = new File(tuningFile);
-      if (!file.exists()) {
-        logger.warn("AutoTune file {} not found - no automatic tuning will be applied", file.getAbsolutePath());
-
-      } else {
-        AutoTuneXmlReader reader = new AutoTuneXmlReader();
-        Autotune profiling = reader.read(file);
-        logger.info("AutoTune loading {} tuning entries", profiling.getOrigin().size());
-        for (Origin origin : profiling.getOrigin()) {
-          queryTuner.load(origin.getKey(), createTunedQueryInfo(origin));
-        }
+      loadTuningFile();
+      if (isRuntimeTuningUpdates()) {
+        // periodically gather and update query tuning
+        server.getBackgroundExecutor().executePeriodically(new ProfilingUpdate(), profilingUpdateFrequency, TimeUnit.SECONDS);
       }
     }
   }
 
-  @NotNull
-  private TunedQueryInfo createTunedQueryInfo(Origin origin) {
-    OrmQueryDetail detail = new OrmQueryDetailParser(origin.getDetail()).parse();
-    return new TunedQueryInfo(detail);
+
+  /**
+   * Return true if the tuning should update periodically at runtime.
+   */
+  private boolean isRuntimeTuningUpdates() {
+    return profilingUpdateFrequency > 0;
   }
 
-  private void saveProfiling(boolean reset) {
+  private class ProfilingUpdate implements Runnable {
 
-    Autotune document = new Autotune();
-
-    AutoTuneCollection autoTuneCollection = profileManager.profilingCollection(reset);
-
-    List<AutoTuneCollection.Entry> entries = autoTuneCollection.getEntries();
-
-    // count "new" and "diff" profiling entries
-    AtomicInteger newCounter = new AtomicInteger();
-    AtomicInteger diffCounter = new AtomicInteger();
-
-    Set<String> profileKeys = new HashSet<String>();
-    for (AutoTuneCollection.Entry entry : entries) {
-      saveProfilingEntry(document, entry, newCounter, diffCounter);
-      profileKeys.add(entry.getOrigin().getKey());
+    @Override
+    public void run() {
+      runtimeTuningUpdate();
     }
+  }
 
-    // report the origin keys that we didn't collect any profiling on
-    Set<String> tunerKeys = queryTuner.keySet();
-    for (String tuneKey : tunerKeys) {
-      if (!profileKeys.contains(tuneKey)) {
-        ProfileEmpty profileEmpty = document.getProfileEmpty();
-        if (profileEmpty == null) {
-          profileEmpty = new ProfileEmpty();
-          document.setProfileEmpty(profileEmpty);
-        }
-        Origin emptyOrigin = new Origin();
-        emptyOrigin.setKey(tuneKey);
-        profileEmpty.getOrigin().add(emptyOrigin);
-      }
-    }
-
-    int totalNew = newCounter.get();
-    int totalDiff = diffCounter.get();
-    if (totalNew == 0 && totalDiff == 0) {
-      logger.info("No new or diff entries for profiling server:{}", serverName);
+  /**
+   * Load tuning information from an existing tuning file.
+   */
+  private void loadTuningFile() {
+    File file = new File(tuningFile);
+    if (!file.exists()) {
+      logger.warn("AutoTune file {} not found - no initial automatic query tuning", file.getAbsolutePath());
 
     } else {
-      sortDocument(document);
-
-      SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd-HHmmss");
-      String now = df.format(new Date());
-
-      // write the file with serverName and now suffix as we can output the profiling many times
-      File file = new File(profilingFile + "-" + serverName + "-" + now + ".xml");
-      AutoTuneXmlWriter writer = new AutoTuneXmlWriter();
-      writer.write(document, file);
-
-      logger.info("writing new:{} diff:{} profiling entries for server:{}", totalNew, totalDiff, serverName);
-    }
-  }
-
-  /**
-   * Set the diff and new entries by bean type followed by key.
-   */
-  private void sortDocument(Autotune document) {
-
-    ProfileDiff profileDiff = document.getProfileDiff();
-    if (profileDiff != null) {
-      Collections.sort(profileDiff.getOrigin(), new OriginNameKeySort());
-    }
-    ProfileNew profileNew = document.getProfileNew();
-    if (profileNew != null) {
-      Collections.sort(profileNew.getOrigin(), new OriginNameKeySort());
-    }
-    ProfileEmpty profileEmpty = document.getProfileEmpty();
-    if (profileEmpty != null) {
-      Collections.sort(profileEmpty.getOrigin(), new OriginKeySort());
-    }
-  }
-
-  /**
-   * Comparator sort by bean type then key.
-   */
-  class OriginNameKeySort implements Comparator<Origin> {
-
-    @Override
-    public int compare(Origin o1, Origin o2) {
-      int comp = o1.getBeanType().compareTo(o2.getBeanType());
-      if (comp == 0) {
-        comp = o1.getKey().compareTo(o2.getKey());
+      AutoTuneXmlReader reader = new AutoTuneXmlReader();
+      Autotune profiling = reader.read(file);
+      logger.info("AutoTune loading {} tuning entries", profiling.getOrigin().size());
+      for (Origin origin : profiling.getOrigin()) {
+        queryTuner.put(origin);
       }
-      return comp;
     }
   }
 
   /**
-   * Comparator sort by bean type then key.
+   * Collect profiling, check for new/diff to existing tuning and apply changes.
    */
-  class OriginKeySort implements Comparator<Origin> {
+  private void runtimeTuningUpdate() {
 
-    @Override
-    public int compare(Origin o1, Origin o2) {
-      return o1.getKey().compareTo(o2.getKey());
+    synchronized (this) {
+      try {
+        long start = System.currentTimeMillis();
+
+        AutoTuneCollection profiling = profileManager.profilingCollection(false);
+
+        AutoTuneDiffCollection event = new AutoTuneDiffCollection(profiling, queryTuner, true);
+        event.process();
+        if (event.isEmpty()) {
+          long exeMillis = System.currentTimeMillis() - start;
+          logger.debug("No query tuning updates for server:{} executionMillis:{}", serverName, exeMillis);
+
+        } else {
+          // report the query tuning changes that have been made
+          runtimeChangeCount += event.getChangeCount();
+          event.writeFile(profilingFile + "-" + serverName + "-update");
+          long exeMillis = System.currentTimeMillis() - start;
+          logger.info("query tuning updates - new:{} diff:{} for server:{} executionMillis:{}", event.getNewCount(), event.getDiffCount(), serverName, exeMillis);
+        }
+      } catch (Throwable e) {
+        logger.error("Error collecting or applying automatic query tuning", e);
+      }
     }
   }
 
-  private void saveProfilingEntry(Autotune document, AutoTuneCollection.Entry entry, AtomicInteger newCount, AtomicInteger diffCount) {
+  private void saveProfilingOnShutdown(boolean reset) {
 
-    ObjectGraphOrigin point = entry.getOrigin();
-    OrmQueryDetail profileDetail = entry.getDetail();
+    synchronized (this) {
+      if (isRuntimeTuningUpdates()) {
+        runtimeTuningUpdate();
+        outputAllTuning();
 
-    // compare with the existing query tuning entry
-    OrmQueryDetail tuneDetail = queryTuner.get(point.getKey());
-    if (tuneDetail == null) {
-      // New entry
-      newCount.incrementAndGet();
-      ProfileNew profileNew = document.getProfileNew();
-      if (profileNew == null) {
-        profileNew = new ProfileNew();
-        document.setProfileNew(profileNew);
+      } else {
+
+        AutoTuneCollection profiling = profileManager.profilingCollection(reset);
+
+        AutoTuneDiffCollection event = new AutoTuneDiffCollection(profiling, queryTuner, false);
+        event.process();
+        if (event.isEmpty()) {
+          logger.info("No new or diff entries for profiling server:{}", serverName);
+
+        } else {
+          event.writeFile(profilingFile + "-" + serverName);
+          logger.info("writing new:{} diff:{} profiling entries for server:{}", event.getNewCount(), event.getDiffCount(), serverName);
+        }
       }
-      Origin origin = createOrigin(entry, point);
-      origin.setOriginal(entry.getOriginalQuery());
-      profileNew.getOrigin().add(origin);
-
-    } else if (!tuneDetail.isAutoTuneEqual(profileDetail)) {
-      // Diff entry
-      diffCount.incrementAndGet();
-      Origin origin = createOrigin(entry, point);
-      origin.setOriginal(tuneDetail.toString());
-      ProfileDiff diff = document.getProfileDiff();
-      if (diff == null) {
-        diff = new ProfileDiff();
-        document.setProfileDiff(diff);
-      }
-      diff.getOrigin().add(origin);
     }
   }
 
   /**
-   * Create the XML Origin bean for the given entry and ObjectGraphOrigin.
+   * Output all the query tuning (the "all" file).
+   * <p>
+   * This is the originally loaded tuning plus any tuning changes picked up and applied at runtime.
+   * </p>
+   * <p>
+   * This "all" file can be used as the next "ebean-autotune.xml" file.
+   * </p>
    */
-  @NotNull
-  private Origin createOrigin(AutoTuneCollection.Entry entry, ObjectGraphOrigin point) {
-    Origin origin = new Origin();
-    origin.setKey(point.getKey());
-    origin.setBeanType(point.getBeanType());
-    origin.setDetail(entry.getDetail().toString());
-    origin.setCallStack(point.getCallStack().description("\n"));
-    return origin;
+  private void outputAllTuning() {
+
+    if (runtimeChangeCount == 0) {
+      logger.info("no runtime query tuning changes for server:{}", serverName);
+
+    } else {
+      AutoTuneAllCollection event = new AutoTuneAllCollection(queryTuner);
+      int size = event.size();
+      event.writeFile(profilingFile + "-" + serverName + "-all");
+      logger.info("query tuning detected [{}] changes, writing all [{}] tuning entries for server:{}", runtimeChangeCount, size, serverName);
+    }
   }
 
   /**
@@ -250,12 +200,29 @@ public class DefaultAutoTuneService implements AutoTuneService {
    */
   @Override
   public void shutdown() {
-    if (profiling && !skipCollectionOnShutdown) {
-      collectProfiling(-1);
-      saveProfiling(false);
+    if (profiling) {
+      if (!skipGarbageCollectionOnShutdown && !skipProfileReportingOnShutdown) {
+        // trigger GC to update profiling information on recently executed queries
+        collectProfiling(-1);
+      }
+      if (!skipProfileReportingOnShutdown) {
+        saveProfilingOnShutdown(false);
+      }
     }
   }
 
+  /**
+   * Output the profiling.
+   * <p>
+   * When profiling updates are applied to tuning at runtime this reports all tuning and profiling combined.
+   * When profiling is not applied at runtime then this reports the diff report with new and diff entries relative
+   * to the existing tuning.
+   * </p>
+   */
+  public void reportProfiling() {
+    saveProfilingOnShutdown(false);
+  }
+
   /**
    * Ask for a System.gc() so that we gather node usage information.
    * <p>

src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java

@@ -118,7 +118,6 @@ public class ProfileManager implements ProfilingListener {
     AutoTuneCollection req = new AutoTuneCollection();
 
     for (ProfileOrigin origin : profileMap.values()) {
-
       BeanDescriptor<?> desc = server.getBeanDescriptorById(origin.getOrigin().getBeanType());
       if (desc != null) {
         origin.profilingCollection(desc, req, reset);

src/main/java/com/avaje/ebeaninternal/server/autotune/service/SortAutoTuneDocument.java

@@ -0,0 +1,71 @@
+package com.avaje.ebeaninternal.server.autotune.service;
+
+import com.avaje.ebeaninternal.server.autotune.model.Autotune;
+import com.avaje.ebeaninternal.server.autotune.model.Origin;
+import com.avaje.ebeaninternal.server.autotune.model.ProfileDiff;
+import com.avaje.ebeaninternal.server.autotune.model.ProfileEmpty;
+import com.avaje.ebeaninternal.server.autotune.model.ProfileNew;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Sorts Autotune document by
+ */
+public class SortAutoTuneDocument {
+
+
+  /**
+   * Set the diff and new entries by bean type followed by key.
+   */
+  public static void sort(Autotune document) {
+
+    ProfileDiff profileDiff = document.getProfileDiff();
+    if (profileDiff != null) {
+      Collections.sort(profileDiff.getOrigin(), NAME_KEY_SORT);
+    }
+    ProfileNew profileNew = document.getProfileNew();
+    if (profileNew != null) {
+      Collections.sort(profileNew.getOrigin(), NAME_KEY_SORT);
+    }
+    ProfileEmpty profileEmpty = document.getProfileEmpty();
+    if (profileEmpty != null) {
+      Collections.sort(profileEmpty.getOrigin(), KEY_SORT);
+    }
+    List<Origin> origins = document.getOrigin();
+    if (!origins.isEmpty()) {
+      Collections.sort(origins, NAME_KEY_SORT);
+    }
+  }
+
+  private static final OriginNameKeySort NAME_KEY_SORT = new OriginNameKeySort();
+
+  private static final OriginKeySort KEY_SORT = new OriginKeySort();
+
+  /**
+   * Comparator sort by bean type then key.
+   */
+  private static class OriginNameKeySort implements Comparator<Origin> {
+
+    @Override
+    public int compare(Origin o1, Origin o2) {
+      int comp = o1.getBeanType().compareTo(o2.getBeanType());
+      if (comp == 0) {
+        comp = o1.getKey().compareTo(o2.getKey());
+      }
+      return comp;
+    }
+  }
+
+  /**
+   * Comparator sort by bean type then key.
+   */
+  private static class OriginKeySort implements Comparator<Origin> {
+
+    @Override
+    public int compare(Origin o1, Origin o2) {
+      return o1.getKey().compareTo(o2.getKey());
+    }
+  }
+}

src/main/java/com/avaje/ebeaninternal/server/autotune/service/TunedQueryInfo.java

@@ -1,7 +1,9 @@
 package com.avaje.ebeaninternal.server.autotune.service;
 
 import com.avaje.ebeaninternal.api.SpiQuery;
+import com.avaje.ebeaninternal.server.autotune.model.Origin;
 import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
+import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetailParser;
 
 import java.io.Serializable;
 
@@ -11,10 +13,20 @@ import java.io.Serializable;
  */
 public class TunedQueryInfo implements Serializable {
 
+  private final Origin origin;
+
   private final OrmQueryDetail tunedDetail;
 
-  public TunedQueryInfo(OrmQueryDetail tunedDetail) {
-    this.tunedDetail = tunedDetail;
+  public TunedQueryInfo(Origin origin) {
+    this.origin = origin;
+    this.tunedDetail = new OrmQueryDetailParser(origin.getDetail()).parse();
+  }
+
+  /**
+   * Return the origin entry (includes call stack and bean type).
+   */
+  public Origin getOrigin() {
+    return origin;
   }
 
   /**

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

@@ -6,23 +6,20 @@ import com.avaje.ebean.bean.BeanCollection;
 import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.bean.EntityBeanIntercept;
 import com.avaje.ebean.bean.PersistenceContext;
-import com.avaje.ebeaninternal.api.LoadBeanBuffer;
 import com.avaje.ebeaninternal.api.LoadBeanRequest;
-import com.avaje.ebeaninternal.api.LoadManyBuffer;
 import com.avaje.ebeaninternal.api.LoadManyRequest;
+import com.avaje.ebeaninternal.api.LoadRequest;
 import com.avaje.ebeaninternal.api.SpiQuery;
 import com.avaje.ebeaninternal.api.SpiQuery.Mode;
 import com.avaje.ebeaninternal.api.SpiTransaction;
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import com.avaje.ebeaninternal.server.lib.util.StringHelper;
 import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.EntityNotFoundException;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -86,89 +83,11 @@ public class DefaultBeanLoader {
 
     int batchSize = getBatchSize(batch.size());
 
-    LoadManyBuffer ctx = loadRequest.getLoadContext();
-    BeanPropertyAssocMany<?> many = ctx.getBeanProperty();
+    SpiQuery<?> query = loadRequest.createQuery(server, batchSize);
 
-    PersistenceContext pc = ctx.getPersistenceContext();
+    executeQuery(loadRequest, query);
 
-    ArrayList<Object> idList = new ArrayList<Object>(batchSize);
-
-    for (int i = 0; i < batch.size(); i++) {
-      BeanCollection<?> bc = batch.get(i);
-      EntityBean ownerBean = bc.getOwnerBean();
-      Object id = many.getParentId(ownerBean);
-      idList.add(id);
-    }
-    int extraIds = batchSize - batch.size();
-    if (extraIds > 0) {
-      Object firstId = idList.get(0);
-      for (int i = 0; i < extraIds; i++) {
-        idList.add(firstId);
-      }
-    }
-
-    BeanDescriptor<?> desc = ctx.getBeanDescriptor();
-
-    SpiQuery<?> query = (SpiQuery<?>) server.createQuery(many.getTargetType());
-    String orderBy = many.getLazyFetchOrderBy();
-    if (orderBy != null) {
-      query.orderBy(orderBy);
-    }
-
-    String extraWhere = many.getExtraWhere();
-    if (extraWhere != null) {
-      // replace special ${ta} placeholder with the base table alias 
-      // which is always t0 and add the extra where clause
-      String ew = StringHelper.replaceString(extraWhere, "${ta}", "t0");
-      query.where().raw(ew);
-    }
-
-    query.setLazyLoadForParents(many);
-    many.addWhereParentIdIn(query, idList);
-
-    query.setPersistenceContext(pc);
-
-    String mode = loadRequest.isLazy() ? "+lazy" : "+query";
-    query.setLoadDescription(mode, loadRequest.getDescription());
-
-    if (loadRequest.isLazy()) {
-      // cascade the batch size (if set) for further lazy loading
-      query.setLazyLoadBatchSize(loadRequest.getBatchSize());
-    }
-
-    // potentially changes the joins and selected properties
-    ctx.configureQuery(query);
-
-    if (loadRequest.isOnlyIds()) {
-      // override to just select the Id values
-      query.select(many.getTargetIdProperty());
-    }
-
-    if (onIterateUseExtraTxn && loadRequest.isParentFindIterate()) {
-      // MySql - we need a different transaction to execute the secondary query
-      SpiTransaction extraTxn = server.createQueryTransaction();
-      try {
-        server.findList(query, extraTxn);
-      } finally {
-        extraTxn.end();
-      }
-    } else {
-      server.findList(query, loadRequest.getTransaction());
-    }
-
-    // check for BeanCollection's that where never processed
-    // in the +query or +lazy load due to no rows (predicates)
-    for (int i = 0; i < batch.size(); i++) {
-      BeanCollection<?> bc = batch.get(i);
-      if (bc.checkEmptyLazyLoad()) {
-        if (logger.isDebugEnabled()) {
-          logger.debug("BeanCollection after load was empty. Owner:" + batch.get(i).getOwnerBean());
-        }
-      } else if (loadRequest.isLoadCache()) {
-        Object parentId = desc.getId(bc.getOwnerBean());
-        desc.cacheManyPropPut(many, bc, parentId);
-      }
-    }
+    loadRequest.postLoad();
 
     // log the query (for testing secondary queries)
     loadRequest.logSecondaryQuery(query);
@@ -274,96 +193,50 @@ public class DefaultBeanLoader {
   public void loadBean(LoadBeanRequest loadRequest) {
 
     List<EntityBeanIntercept> batch = loadRequest.getBatch();
-
     if (batch.isEmpty()) {
       throw new RuntimeException("Nothing in batch?");
     }
 
     int batchSize = getBatchSize(batch.size());
 
-    LoadBeanBuffer ctx = loadRequest.getLoadContext();
-    BeanDescriptor<?> desc = ctx.getBeanDescriptor();
-
-    Class<?> beanType = desc.getBeanType();
-
-    EntityBeanIntercept[] ebis = batch.toArray(new EntityBeanIntercept[batch.size()]);
-    ArrayList<Object> idList = new ArrayList<Object>(batchSize);
-
-    for (int i = 0; i < batch.size(); i++) {
-      EntityBeanIntercept ebi = batch.get(i);
-      EntityBean bean = ebi.getOwner();
-      Object id = desc.getId(bean);
-      idList.add(id);
-    }
-
+    List<Object> idList = loadRequest.getIdList(batchSize);
     if (idList.isEmpty()) {
       // everything was loaded from cache
       return;
     }
 
-    int extraIds = batchSize - batch.size();
-    if (extraIds > 0) {
-      // for performance make up the Id's to the batch size
-      // so we get the same query (for Ebean and the db)
-      Object firstId = idList.get(0);
-      for (int i = 0; i < extraIds; i++) {
-        // just add the first Id again
-        idList.add(firstId);
-      }
-    }
+    SpiQuery<?> query = (SpiQuery<?>) server.createQuery(loadRequest.getBeanType());
+    loadRequest.configureQuery(query);
 
-    PersistenceContext persistenceContext = ctx.getPersistenceContext();
-
-    SpiQuery<?> query = (SpiQuery<?>) server.createQuery(beanType);
-
-    query.setMode(Mode.LAZYLOAD_BEAN);
-    query.setPersistenceContext(persistenceContext);
-
-    String mode = loadRequest.isLazy() ? "+lazy" : "+query";
-    query.setLoadDescription(mode, loadRequest.getDescription());
-
-    if (loadRequest.isLazy()) {
-      // cascade the batch size (if set) for further lazy loading
-      query.setLazyLoadBatchSize(loadRequest.getBatchSize());
-    }
-
-    ctx.configureQuery(query, loadRequest.getLazyLoadProperty());
-
-    // make sure the query doesn't use the cache
-    // query.setUseCache(false);
     if (idList.size() == 1) {
       query.where().idEq(idList.get(0));
     } else {
       query.where().idIn(idList);
     }
 
-    List<?> list;
+    List<?> list = executeQuery(loadRequest, query);
+
+    loadRequest.postLoad(list);
+
+    // log the query (for testing secondary queries)
+    loadRequest.logSecondaryQuery(query);
+  }
+
+  /**
+   * Execute the lazy load query taking into account MySql transaction oddness.
+   */
+  private List<?> executeQuery(LoadRequest loadRequest, SpiQuery<?> query) {
     if (onIterateUseExtraTxn && loadRequest.isParentFindIterate()) {
       // MySql - we need a different transaction to execute the secondary query
       SpiTransaction extraTxn = server.createQueryTransaction();
       try {
-        list = server.findList(query, extraTxn);
+        return server.findList(query, extraTxn);
       } finally {
         extraTxn.end();
       }
     } else {
-      list = server.findList(query, loadRequest.getTransaction());
+      return server.findList(query, loadRequest.getTransaction());
     }
-
-    if (loadRequest.isLoadCache()) {
-      for (int i = 0; i < list.size(); i++) {
-        desc.cacheBeanPutData((EntityBean) list.get(i));
-      }
-    }
-
-    for (int i = 0; i < ebis.length; i++) {
-      // Check if the underlying row in DB was deleted. Mark this bean as 'failed' if
-      // necessary but allow processing to continue until it is accessed by client code
-      ebis[i].checkLazyLoadFailure();
-    }
-
-    // log the query (for testing secondary queries)
-    loadRequest.logSecondaryQuery(query);
   }
 
   public void refresh(EntityBean bean) {

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

@@ -142,7 +142,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   private final List<SpiServerPlugin> serverPlugins;
 
-  private DdlGenerator ddlGenerator;
+  private final DdlGenerator ddlGenerator;
 
   private final ExpressionFactory expressionFactory;
 
@@ -235,6 +235,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     this.beanLoader = new DefaultBeanLoader(this);
     this.jsonContext = config.createJsonContext(this);
     this.serverPlugins = config.getPlugins();
+    this.ddlGenerator = new DdlGenerator(this, serverConfig);
 
     // load normal plugins late and call setup on all
     loadAndInitializePlugins(config.getServerConfig());
@@ -261,18 +262,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     for (SpiEbeanPlugin plugin : ServiceLoader.load(SpiEbeanPlugin.class)) {
       spiPlugins.add(plugin);
       plugin.setup(this, config);
-
-      if (plugin instanceof DdlGenerator) {
-        // backwards compatible
-        ddlGenerator = (DdlGenerator) plugin;
-      }
-    }
-    
-    if (ddlGenerator == null) {
-      // ServiceLoader not finding ddlGenerator (typically OSGi) 
-      ddlGenerator = new DdlGenerator();
-      spiPlugins.add(ddlGenerator);
-      ddlGenerator.setup(this, config);
     }
 
     ebeanPlugins = Collections.unmodifiableList(spiPlugins);
@@ -289,6 +278,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Execute all the plugins with an online flag indicating the DB is up or not.
    */
   public void executePlugins(boolean online) {
+
+    ddlGenerator.execute(online);
+
     for (SpiEbeanPlugin plugin : ebeanPlugins) {
       plugin.execute(online);
     }
@@ -337,10 +329,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return expressionFactory;
   }
 
-  public DdlGenerator getDdlGenerator() {
-    return ddlGenerator;
-  }
-
   @Override
   public AutoTune getAutoTune() {
     return autoTuneService;

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

@@ -54,6 +54,7 @@ import javax.sql.DataSource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.ServiceLoader;
 
 /**
  * Used to extend the ServerConfig with additional objects used to configure and
@@ -165,6 +166,14 @@ public class InternalConfiguration {
    * Return the list of plugins we collected during construction.
    */
   public List<SpiServerPlugin> getPlugins() {
+
+    // find additional plugins via ServiceLoader ...
+    for (SpiServerPlugin plugin : ServiceLoader.load(SpiServerPlugin.class)) {
+      if (!plugins.contains(plugin)) {
+        plugins.add(plugin);
+      }
+    }
+
     return plugins;
   }
 

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

@@ -2316,7 +2316,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, SpiBeanType<T> {
    */
   public void appendOrderById(SpiQuery<T> query) {
 
-    if (idProperty != null) {
+    if (idProperty != null && !idProperty.isEmbedded()) {
       OrderBy<T> orderBy = query.getOrderBy();
       if (orderBy == null || orderBy.isEmpty()) {
         query.order().asc(idProperty.getName());

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

@@ -85,8 +85,8 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
 	public void initialise() {
 		// this *MUST* execute after the BeanDescriptor is
 		// put into the map to stop infinite recursion
-		if (!isTransient){
-			targetDescriptor = descriptor.getBeanDescriptor(targetType);
+    targetDescriptor = descriptor.getBeanDescriptor(targetType);
+    if (!isTransient){
 			targetIdBinder = targetDescriptor.getIdBinder();
 			targetInheritInfo = targetDescriptor.getInheritInfo();
 			saveRecurseSkippable = targetDescriptor.isSaveRecurseSkippable();

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

@@ -887,7 +887,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
       if (help != null) {
         help.jsonWrite(ctx, name, value, include != null);
       } else {
-        if (isTransient) {
+        if (isTransient && targetDescriptor == null) {
           ctx.writeValueUsingObjectMapper(name, value);
         } else {
           Collection<?> collection = (Collection<?>)value;

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

@@ -101,14 +101,23 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
         // no imported or exported information
       } else if (!oneToOneExported) {
         importedId = createImportedId(this, targetDescriptor, tableJoin);
+        if (importedId.isScalar()) {
+          // limit JoinColumn mapping to the @Id / primary key
+          TableJoinColumn[] columns = tableJoin.columns();
+          String foreignJoinColumn = columns[0].getForeignDbColumn();
+          String foreignIdColumn = targetDescriptor.getIdProperty().getDbColumn();
+          if (!foreignJoinColumn.equalsIgnoreCase(foreignIdColumn)) {
+            throw new PersistenceException("Mapping limitation - @JoinColumn on " + getFullBeanName() + " needs to map to a primary key as per Issue #529 "
+                + " - joining to " + foreignJoinColumn + " and not " + foreignIdColumn);
+          }
+        }
+
       } else {
         exportedProperties = createExported();
 
         String delStmt = "delete from " + targetDescriptor.getBaseTable() + " where ";
-
         deleteByParentIdSql = delStmt + deriveWhereParentIdSql(false);
         deleteByParentIdInSql = delStmt + deriveWhereParentIdSql(true);
-
       }
     }
   }

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

@@ -14,6 +14,8 @@ import com.avaje.ebeaninternal.api.SpiExpressionValidation;
 import com.avaje.ebeaninternal.server.core.OrmQueryRequest;
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
 import com.avaje.ebeaninternal.server.deploy.BeanProperty;
+import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+import com.avaje.ebeaninternal.server.query.SplitName;
 
 /**
  * A "Query By Example" type of expression.
@@ -207,25 +209,41 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
     OrmQueryRequest<?> r = (OrmQueryRequest<?>) request;
     BeanDescriptor<?> beanDescriptor = r.getBeanDescriptor();
 
-    for (BeanProperty beanProperty : beanDescriptor.propertiesAll()) {
-      
-      String propName = beanProperty.getName();
-      Object value = beanProperty.getValue(entity);
+    addExpressions(list, beanDescriptor, entity, null);
 
-      if (beanProperty.isScalar() && value != null) {
-        if (value instanceof String) {
-          list.add(new LikeExpression(propName, (String) value, caseInsensitive, likeType));
-        } else {
-          // exclude the zero values typically to weed out
-          // primitive int and long that initialise to 0
-          if (includeZeros || !isZero(value)) {
-            list.add(new SimpleExpression(propName, Op.EQ, value));
+    return list;
+  }
+
+  /**
+   * Add expressions to the list for all the non-null properties (and do this recursively).
+   */
+  private void addExpressions(ArrayList<SpiExpression> list, BeanDescriptor<?> beanDescriptor, EntityBean bean, String prefix) {
+
+    for (BeanProperty beanProperty : beanDescriptor.propertiesAll()) {
+
+      if (!beanProperty.isTransient()) {
+        Object value = beanProperty.getValue(bean);
+        if (value != null) {
+          String propName = SplitName.add(prefix, beanProperty.getName());
+          if (beanProperty.isScalar()) {
+            if (value instanceof String) {
+              list.add(new LikeExpression(propName, (String) value, caseInsensitive, likeType));
+            } else {
+              // exclude the zero values typically to weed out
+              // primitive int and long that initialise to 0
+              if (includeZeros || !isZero(value)) {
+                list.add(new SimpleExpression(propName, Op.EQ, value));
+              }
+            }
+
+          } else if ((beanProperty instanceof BeanPropertyAssocOne) && (value instanceof EntityBean)) {
+            BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne)beanProperty;
+            BeanDescriptor targetDescriptor = assocOne.getTargetDescriptor();
+            addExpressions(list, targetDescriptor, (EntityBean)value, propName);
           }
         }
       }
     }
-
-    return list;
   }
 
   /**

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

@@ -1,5 +1,12 @@
 package com.avaje.ebeaninternal.server.lib.sql;
 
+import com.avaje.ebean.config.DataSourceConfig;
+import com.avaje.ebeaninternal.api.ClassUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.PersistenceException;
+import javax.sql.DataSource;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -12,15 +19,6 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 
-import javax.persistence.PersistenceException;
-import javax.sql.DataSource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.avaje.ebean.config.DataSourceConfig;
-import com.avaje.ebeaninternal.api.ClassUtil;
-
 /**
  * A robust DataSource.
  * <p>
@@ -244,6 +242,13 @@ public class DataSourcePool implements DataSource {
 
   private void initialise() throws SQLException {
 
+    // Ensure database driver is loaded
+    try {
+      ClassUtil.forName(this.databaseDriver);
+    } 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/loadcontext/DLoadBeanContext.java

@@ -190,7 +190,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
         }
       }
 
-      LoadBeanRequest req = new LoadBeanRequest(this, ebi.getLazyLoadProperty(), context.hitCache);
+      LoadBeanRequest req = new LoadBeanRequest(this, ebi.getLazyLoadPropertyIndex(), ebi.getLazyLoadProperty(), context.hitCache);
       context.desc.getEbeanServer().loadBean(req);
     }
 

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

@@ -603,7 +603,7 @@ public class SqlTreeBuilder {
           // no extra join required for embedded beans
           return null;
         }
-        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, assocProp);
+        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, assocProp, elGetValue.containsMany());
         joinRegister.put(propertyName, extraJoin);
         return extraJoin;
       }

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

@@ -29,11 +29,14 @@ public class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
   private final boolean manyJoin;
 
+  private final boolean pathContainsMany;
+
   private List<SqlTreeNodeExtraJoin> children;
 
-  public SqlTreeNodeExtraJoin(String prefix, BeanPropertyAssoc<?> assocBeanProperty) {
+  public SqlTreeNodeExtraJoin(String prefix, BeanPropertyAssoc<?> assocBeanProperty, boolean pathContainsMany) {
     this.prefix = prefix;
     this.assocBeanProperty = assocBeanProperty;
+    this.pathContainsMany = pathContainsMany;
     this.manyJoin = assocBeanProperty instanceof BeanPropertyAssocMany<?>;
   }
 
@@ -95,13 +98,17 @@ public class SqlTreeNodeExtraJoin implements SqlTreeNode {
       }
     }
 
+    if (pathContainsMany) {
+      // "promote" to left outer as the path contains a many
+      joinType = SqlJoinType.OUTER;
+    }
     if (!manyToMany) {
       assocBeanProperty.addJoin(joinType, prefix, ctx);
     }
 
     if (children != null) {
 
-      if (manyJoin) {
+      if (manyJoin || pathContainsMany) {
         // if AUTO then make all descendants use OUTER JOIN
         joinType = joinType.autoToOuter();
       }

src/main/java/com/avaje/ebeaninternal/server/transaction/ExplicitTransactionManager.java

@@ -2,11 +2,13 @@ package com.avaje.ebeaninternal.server.transaction;
 
 import com.avaje.ebean.BackgroundExecutor;
 import com.avaje.ebean.config.ServerConfig;
+import com.avaje.ebean.config.dbplatform.DatabasePlatform;
 import com.avaje.ebeaninternal.api.SpiTransaction;
 import com.avaje.ebeaninternal.server.cluster.ClusterManager;
 import com.avaje.ebeaninternal.server.core.BootupClasses;
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptorManager;
 
+import javax.sql.DataSource;
 import java.sql.Connection;
 
 /**
@@ -29,4 +31,23 @@ public class ExplicitTransactionManager extends TransactionManager {
     return new ExplicitJdbcTransaction(prefix + id, explicit, c, this);
   }
 
+  /**
+   * Override the initialise of OnQueryOnly with the intention not to use CLOSE with ExplicitJdbcTransaction.
+   */
+  @Override
+  protected DatabasePlatform.OnQueryOnly initOnQueryOnly(DatabasePlatform.OnQueryOnly dbPlatformOnQueryOnly, DataSource ds) {
+
+    // first check for a system property 'override'
+    String systemPropertyValue = System.getProperty("ebean.transaction.onqueryonly");
+    if (systemPropertyValue != null) {
+      return DatabasePlatform.OnQueryOnly.valueOf(systemPropertyValue.trim().toUpperCase());
+    }
+
+    if (DatabasePlatform.OnQueryOnly.CLOSE.equals(dbPlatformOnQueryOnly)) {
+      // Not using OnQueryOnly.CLOSE with ExplicitJdbcTransaction
+      return DatabasePlatform.OnQueryOnly.COMMIT;
+    }
+    // default to commit if not defined on the platform
+    return dbPlatformOnQueryOnly == null ? DatabasePlatform.OnQueryOnly.COMMIT : dbPlatformOnQueryOnly;
+  }
 }

src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionManager.java

@@ -164,7 +164,7 @@ public class TransactionManager {
    * just for queries do need to be committed or rollback after the query.
    * </p>
    */
-  private OnQueryOnly initOnQueryOnly(OnQueryOnly dbPlatformOnQueryOnly, DataSource ds) {
+  protected OnQueryOnly initOnQueryOnly(OnQueryOnly dbPlatformOnQueryOnly, DataSource ds) {
 
     // first check for a system property 'override'
     String systemPropertyValue = System.getProperty("ebean.transaction.onqueryonly");
@@ -190,7 +190,7 @@ public class TransactionManager {
   /**
    * Return true if the isolation level is read committed.
    */
-  private boolean isReadCommittedIsolation(DataSource ds) {
+  protected boolean isReadCommittedIsolation(DataSource ds) {
 
     if (DbOffline.isSet()) {
       return true;

src/main/resources/META-INF/services/com.avaje.ebeaninternal.api.SpiEbeanPlugin

@@ -1 +0,0 @@
-com.avaje.ebean.dbmigration.DdlGenerator

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

@@ -24,4 +24,9 @@ public class BaseTestCase {
     SpiEbeanServer spi = (SpiEbeanServer)Ebean.getDefaultServer();
     return spi.getDatabasePlatform().getName().startsWith("mssqlserver");
   }
+
+  public boolean isH2() {
+    SpiEbeanServer spi = (SpiEbeanServer)Ebean.getDefaultServer();
+    return spi.getDatabasePlatform().getName().equals("h2");
+  }
 }

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

@@ -30,7 +30,6 @@ public class PrimaryServerTest {
   public void testLoadProperties() throws Exception {
 
     Properties properties = PrimaryServer.getProperties();
-    System.out.println(properties);
     assertTrue(properties.size() > 0);
   }
 }

src/test/java/com/avaje/ebean/dbmigration/DdlParserTest.java

@@ -0,0 +1,58 @@
+package com.avaje.ebean.dbmigration;
+
+import org.junit.Test;
+
+import java.io.StringReader;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class DdlParserTest {
+
+  DdlParser parser = new DdlParser();
+
+  @Test
+  public void parse_ignoresEmptyLines() throws Exception {
+
+    List<String> stmts = parser.parse(new StringReader("\n\none;\n\ntwo;\n\n"));
+
+    assertThat(stmts).hasSize(2);
+    assertThat(stmts).contains("one;","two;");
+  }
+
+  @Test
+  public void parse_ignoresComments_whenFirst() throws Exception {
+
+    List<String> stmts = parser.parse(new StringReader("-- comment\ntwo;"));
+
+    assertThat(stmts).hasSize(1);
+    assertThat(stmts).contains("two;");
+  }
+
+  @Test
+  public void parse_ignoresEmptyLines_whenFirst() throws Exception {
+
+    List<String> stmts = parser.parse(new StringReader("\n\n-- comment\ntwo;\n\n"));
+    assertThat(stmts).hasSize(1);
+    assertThat(stmts).contains("two;");
+  }
+
+  @Test
+  public void parse_inlineEmptyLines_replacedWithSpace() throws Exception {
+
+    List<String> stmts = parser.parse(new StringReader("\n\n-- comment\none\ntwo;\n\n"));
+    assertThat(stmts).hasSize(1);
+    assertThat(stmts).contains("one two;");
+  }
+
+
+  @Test
+  public void parse_ignoresComments() throws Exception {
+
+    List<String> stmts = parser.parse(new StringReader("one;\n-- comment\ntwo;"));
+
+    assertThat(stmts).hasSize(2);
+    assertThat(stmts).contains("one;","two;");
+  }
+}

src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java

@@ -2,15 +2,11 @@ package com.avaje.ebean.dbmigration.migrationreader;
 
 import com.avaje.ebean.dbmigration.migration.Migration;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
 public class MigrationXmlWriterTest {
 
-  Logger logger = LoggerFactory.getLogger(MigrationXmlWriterTest.class);
-
   @Test
   public void testReadWrite() throws Exception {
 
@@ -20,7 +16,5 @@ public class MigrationXmlWriterTest {
     MigrationXmlWriter writer = new MigrationXmlWriter();
     writer.write(migration, temp);
 
-    logger.info("wrote migration file: "+temp.getAbsolutePath());
-
   }
 }

src/test/java/com/avaje/ebean/elasticsearch/TestBasicPush.java

@@ -61,11 +61,8 @@ public class TestBasicPush extends BaseTestCase {
 
     generator.close();
     String json = writer.toString();
-    System.out.println(json);
 
-    String response = post("http://localhost:9200/_bulk", json);
-
-    System.out.println(response);
+    post("http://localhost:9200/_bulk", json);
 
     //curl -s -XPOST localhost:9200/_bulk
 

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

@@ -82,11 +82,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
-  @Override
-  public DdlGenerator getDdlGenerator() {
-    return null;
-  }
-
   @Override
   public ReadAuditLogger getReadAuditLogger() {
     return null;

src/test/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java

@@ -30,7 +30,7 @@ public class ChangeJsonBuilderTest extends BaseTestCase {
     for (int i = 0; i < changes.size(); i++) {
       StringWriter buffer = new StringWriter();
       builder.writeBeanJson(buffer, changes.get(i), changeSet, i);
-      System.out.println(buffer.toString());
+
       assertThat(buffer.toString()).contains("\"source\"");
       assertThat(buffer.toString()).contains("\"userId\"");
       assertThat(buffer.toString()).contains("\"userIpAddress\"");

src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java

@@ -19,8 +19,6 @@ public class DeployPropertyParserMapTests {
     DeployPropertyParserMap parser = new DeployPropertyParserMap(map);
     
     String output = parser.parse("(lower(customer.name) like ? escape'' or id > ?)");
-    
-    System.out.println(output);
     Assert.assertEquals("(lower(t1.name) like ? escape'' or t0.id > ?)", output);
   }
   

src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java

@@ -0,0 +1,73 @@
+package com.avaje.ebeaninternal.server.expression;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.LikeType;
+import com.avaje.ebean.Query;
+import com.avaje.ebean.bean.EntityBean;
+import com.avaje.ebean.event.BeanQueryRequest;
+import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
+import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import com.avaje.ebeaninternal.api.SpiQuery;
+import com.avaje.ebeaninternal.server.core.OrmQueryRequest;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+import com.avaje.tests.model.basic.Address;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.ResetBasicData;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class DefaultExampleExpressionTest extends BaseTestCase {
+
+
+  @Test
+  public void test() {
+
+    SpiEbeanServer server = (SpiEbeanServer)Ebean.getDefaultServer();
+    BeanDescriptor<Customer> desc = server.getBeanDescriptor(Customer.class);
+
+    SpiQuery<Customer> query = (SpiQuery<Customer>)server.find(Customer.class);
+
+    Address address = new Address();
+    address.setCity("billingAddress.city");
+
+    Customer customer = new Customer();
+    customer.setName("name");
+    customer.setBillingAddress(address);
+
+
+    DefaultExampleExpression expr = new DefaultExampleExpression((EntityBean)customer, false, LikeType.EQUAL_TO);
+
+
+    BeanQueryRequest<?> request = create(query, desc);
+    HashQueryPlanBuilder builder = new HashQueryPlanBuilder();
+    expr.queryPlanHash(request, builder);
+
+    TDSpiExpressionRequest req = new TDSpiExpressionRequest(desc);
+    expr.addBindValues(req);
+
+    assertThat(req.bindValues).contains("name", "billingAddress.city");
+
+    address.setCity("Auckland");
+    customer.setName("Rob");
+
+    ResetBasicData.reset();
+
+    Query<Customer> query1 = server.find(Customer.class)
+        .where().exampleLike(customer)
+        .query();
+
+    query1.findList();
+
+    assertThat(query1.getGeneratedSql()).contains("(t0.name like ? ");
+    assertThat(query1.getGeneratedSql()).contains(" and t1.city like ? ");
+
+  }
+
+  private <T> OrmQueryRequest<T> create(SpiQuery<T> query, BeanDescriptor<T> desc) {
+    return new OrmQueryRequest<T>(null, null, query, desc, null);
+  }
+
+}

src/test/java/com/avaje/ebeaninternal/server/expression/TDSpiExpressionRequest.java

@@ -0,0 +1,78 @@
+package com.avaje.ebeaninternal.server.expression;
+
+import com.avaje.ebeaninternal.api.SpiExpressionRequest;
+import com.avaje.ebeaninternal.server.core.JsonExpressionHandler;
+import com.avaje.ebeaninternal.server.core.SpiOrmQueryRequest;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Test double for testing with SpiExpressionRequest.
+ */
+public class TDSpiExpressionRequest implements SpiExpressionRequest {
+
+  List<Object> bindValues = new ArrayList<Object>();
+
+  final BeanDescriptor<?> descriptor;
+
+  public TDSpiExpressionRequest(BeanDescriptor<?> descriptor) {
+    this.descriptor = descriptor;
+  }
+
+  @Override
+  public JsonExpressionHandler getJsonHandler() {
+    return null;
+  }
+
+  @Override
+  public String parseDeploy(String logicalProp) {
+    return null;
+  }
+
+  @Override
+  public BeanDescriptor<?> getBeanDescriptor() {
+    return descriptor;
+  }
+
+  @Override
+  public SpiOrmQueryRequest<?> getQueryRequest() {
+    return null;
+  }
+
+  @Override
+  public SpiExpressionRequest append(String sql) {
+    return null;
+  }
+
+  @Override
+  public void addBindEncryptKey(Object encryptKey) {
+
+  }
+
+  @Override
+  public void addBindValue(Object bindValue) {
+    bindValues.add(bindValue);
+  }
+
+  @Override
+  public String getSql() {
+    return null;
+  }
+
+  @Override
+  public ArrayList<Object> getBindValues() {
+    return null;
+  }
+
+  @Override
+  public int nextParameter() {
+    return 0;
+  }
+
+  @Override
+  public void appendLike() {
+
+  }
+}

src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMax.java

@@ -49,8 +49,6 @@ public class TestDataSourceMax extends BaseTestCase {
         bg.execute(new ConnRunner(pool, 4000, i));
       }
 
-      System.out.println("main thread sleep ... " + pool.getStatus(false));
-
       Thread.sleep(10000);
       pool.getStatistics(true);
 
@@ -81,9 +79,7 @@ public class TestDataSourceMax extends BaseTestCase {
 
     private void waitSomeTime(long count) {
       try {
-      System.out.println(position+" sleep " + sleepMillis+" count:"+count);
       Thread.sleep(sleepMillis);
-      System.out.println(position+" sleep done");
       } catch (InterruptedException e){
         throw new RuntimeException(e);
       }

src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java

@@ -30,9 +30,6 @@ public class TestDataSourceMaxWithEntity extends BaseTestCase {
         bg.execute(new ConnRunner(server, 4000, i));
       }
 
-      System.out.println("main thread sleep ... ");
-
-   
       Thread.sleep(30000);
       
       server.shutdown(true, false);

src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java

@@ -24,7 +24,6 @@ public class TestRawSqlParsing extends TestCase {
         Sql rs = rawSql.getSql();
         
         String s = rs.toString();
-        System.out.println(s);
         assertTrue(s, s.contains("[order_id, sum"));
         
     }

src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java

@@ -42,7 +42,6 @@ public class TestJsonWriteVisitor extends BaseTestCase {
     options.setPathVisitor("contacts", new ContactVisitor());
 
     String jsonContent = json.toJson(list, options);
-    System.out.println(jsonContent);
 
     assertThat(jsonContent).contains("customerExtra");
     assertThat(jsonContent).contains("contactExtra");

src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java

@@ -42,14 +42,11 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase {
     options.addVisitor("shippingAddress", new ASVisitor());
 
     String s = json.toJson(list);
-    System.out.println(s);
 
     List<Customer> mList = json.toList(Customer.class, s, options);
-    System.out.println("VIA STRING: " + mList);
 
     StringReader reader = new StringReader(s);
     List<Customer> mList2 = json.toList(Customer.class, reader);
-    System.out.println("VIA READER: " + mList2);
 
     assertEquals(mList.size(), mList2.size());
   }
@@ -58,28 +55,28 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase {
 
     @Override
     public void visit(Customer bean, Map<String, Object> unmapped) {
-      System.out.println("visit customer: " + bean);
+      bean.getId();
     }
   }
 
   private static class AVisitor implements JsonReadBeanVisitor<Address> {
 
     public void visit(Address bean, Map<String, Object> unmapped) {
-      System.out.println("visit billing address: " + bean);
+      bean.getId();
     }
   }
 
   private static class ASVisitor implements JsonReadBeanVisitor<Address> {
 
     public void visit(Address bean, Map<String, Object> unmapped) {
-      System.out.println("visit shipping address: " + bean);
+      bean.getId();
     }
   }
 
   private static class ContactVisitor implements JsonReadBeanVisitor<Contact> {
 
     public void visit(Contact bean, Map<String, Object> unmapped) {
-      System.out.println("visit contact: " + bean);
+      bean.getId();
     }
   }
 }

src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java

@@ -17,8 +17,6 @@ public class ScalarTypeLocalDateTest {
     LocalDate date = LocalDate.of(2014, 5, 20);
     long millis = type.convertToMillis(date);
 
-    System.out.println(date);
-
     LocalDate parseDate = type.convertFromMillis(millis);
     assertEquals(date, parseDate);
   }

src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java

@@ -27,7 +27,8 @@ public class MainAutoQueryTune1 {
 			.findList();
 
 		for (Order order : list) {
-			System.out.println(order.getId() + " " + order.getOrderDate());
+			order.getId();
+      order.getOrderDate();
 		}
 	}
 }

src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java

@@ -3,7 +3,9 @@ package com.avaje.tests.autofetch;
 import java.util.List;
 import java.util.Set;
 
+import com.avaje.ebeaninternal.server.autotune.model.Origin;
 import org.avaje.ebeantest.LoggedSqlCollector;
+import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -33,34 +35,6 @@ public class TunedQueryInfoTest extends BaseTestCase {
     serverCacheManager.setCaching(Order.class, false);    
   }
   
-  @Test
-  public void withSelectNull() {
-    
-    init();
-    
-    OrmQueryDetail tunedDetail = new OrmQueryDetail();
-    tunedDetail.select(null);
-    
-    TunedQueryInfo tunedInfo = new TunedQueryInfo(tunedDetail);
-      
-    Query<Order> query = server.find(Order.class).setId(1);
-    
-    tunedInfo.tuneQuery((SpiQuery<?>) query);
-    
-    Order order = query.findUnique();
-    EntityBean eb = (EntityBean)order;
-    EntityBeanIntercept ebi = eb._ebean_getIntercept();
-    
-    Assert.assertTrue(ebi.isFullyLoadedBean());
-    
-    Set<String> loadedPropertyNames = ebi.getLoadedPropertyNames();
-    Assert.assertNull(loadedPropertyNames);
-    
-    // invoke lazy loading
-    order.getCustomer();
-  }
-  
-
   @Test
   public void withSelectEmpty() {
     
@@ -68,9 +42,9 @@ public class TunedQueryInfoTest extends BaseTestCase {
     
     OrmQueryDetail tunedDetail = new OrmQueryDetail();
     tunedDetail.select("");
-    
-    TunedQueryInfo tunedInfo = new TunedQueryInfo(tunedDetail);
-      
+
+    TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail);
+
     Query<Order> query = server.find(Order.class).setId(1);
     
     tunedInfo.tuneQuery((SpiQuery<?>) query);
@@ -95,9 +69,9 @@ public class TunedQueryInfoTest extends BaseTestCase {
     
     OrmQueryDetail tunedDetail = new OrmQueryDetail();
     tunedDetail.select("somethingThatDoesNotExist");
-    
-    TunedQueryInfo tunedInfo = new TunedQueryInfo(tunedDetail);
-      
+
+    TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail);
+
     Query<Order> query = server.find(Order.class).setId(1);
     
     tunedInfo.tuneQuery((SpiQuery<?>) query);
@@ -123,7 +97,14 @@ public class TunedQueryInfoTest extends BaseTestCase {
     Assert.assertTrue(loggedSql.get(0).contains("select t0.id c0, t0.id c1 from o_order t0 where t0.id = ?"));
     Assert.assertTrue(loggedSql.get(1).contains("select t0.id c0, t0.status c1,"));
   }
-  
+
+  @NotNull
+  private TunedQueryInfo createTunedQueryInfo(OrmQueryDetail tunedDetail) {
+    Origin origin = new Origin();
+    origin.setDetail(tunedDetail.toString());
+    return new TunedQueryInfo(origin);
+  }
+
   @Test
   public void withSelectSomeIncludeLazyLoaded() {
     
@@ -132,7 +113,7 @@ public class TunedQueryInfoTest extends BaseTestCase {
     OrmQueryDetail tunedDetail = new OrmQueryDetail();
     tunedDetail.select("status, customer");
     
-    TunedQueryInfo tunedInfo = new TunedQueryInfo(tunedDetail);
+    TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail);
       
     Query<Order> query = server.find(Order.class).setId(1);
     
@@ -167,7 +148,7 @@ public class TunedQueryInfoTest extends BaseTestCase {
     OrmQueryDetail tunedDetail = new OrmQueryDetail();
     tunedDetail.select("status");
     
-    TunedQueryInfo tunedInfo = new TunedQueryInfo(tunedDetail);
+    TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail);
       
     Query<Order> query = server.find(Order.class).setId(1);
     

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

@@ -33,6 +33,7 @@ public class TestBatchLazy extends BaseTestCase {
     }
 
     Ebean.getDefaultServer().getAutoTune().collectProfiling();
+    Ebean.getDefaultServer().getAutoTune().reportProfiling();
 
 	}
 	

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

@@ -16,8 +16,7 @@ public class TestBatchLazyMany extends BaseTestCase {
 	
 		Order order2 = Ebean.getReference(Order.class, 1);
 		order2.getOrderDate();
-		System.out.println("done");
-		
+
 //		List<Order> list = Ebean.find(Order.class)
 //			//.join("details")
 //			//.join("details", "+fetchquery")

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

@@ -47,8 +47,6 @@ public class TestBeanReferenceRefresh extends BaseTestCase {
 		Status statusRefresh = order.getStatus();
 		Assert.assertEquals(status,statusRefresh);
 		
-		System.out.println("done");
-		
 	}
 	
 	

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

@@ -24,7 +24,6 @@ public class TestDeleteImportedPartial extends BaseTestCase {
 
     // should delete file and fileContent
     Ebean.delete(partialPfile);
-    System.out.println("finished delete");
 
     PFile file1 = Ebean.find(PFile.class, id);
     PFileContent content1 = Ebean.find(PFileContent.class, contentId);

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

@@ -26,7 +26,6 @@ public class TestDeleteOneToOneMultiple extends BaseTestCase {
 
     // should delete file and fileContent
     Ebean.delete(PFile.class, id);
-    System.out.println("finished delete");
 
     PFile file1 = Ebean.find(PFile.class, id);
     PFileContent content1 = Ebean.find(PFileContent.class, contentId);

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

@@ -36,14 +36,11 @@ public class TestFetchId extends BaseTestCase {
 		List<Object> partial = futureIds.getPartialIds();
 
 		// this is likely 0 or a small number
-		System.out.println("partial: " + partial.size());
 
 		// wait for all the id's to be fetched
 		List<Object> idList = futureIds.get();
 		Assert.assertTrue("same instance", partial == idList);
 
 		Assert.assertTrue("sz > 0", ids.size() > 0);
-		System.out.println("ids: " + partial);
-
 	}
 }

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

@@ -2,6 +2,7 @@ package com.avaje.tests.basic;
 
 import java.util.List;
 
+import com.avaje.ebean.Query;
 import org.junit.Test;
 
 import com.avaje.ebean.BaseTestCase;
@@ -18,13 +19,7 @@ public class TestM2MCascadeOne extends BaseTestCase {
     MUser u = new MUser();
     u.setUserName("testM2M");
 
-    List<MRole> roles = u.getRoles();
-    if (roles != null) {
-      if (roles instanceof BeanList<?>) {
-        System.out.println("enhancement checkNullManyFields=true successful");
-      }
-    }
-
+    u.getRoles();
     Ebean.save(u);
 
     MRole r0 = new MRole();
@@ -42,4 +37,16 @@ public class TestM2MCascadeOne extends BaseTestCase {
     Ebean.save(u1);
 
   }
+
+  @Test
+  public void testRawPredicate_with_ManyToManyPath() {
+
+    Query<MUser> query = Ebean.find(MUser.class)
+        .select("userid")
+        .where().raw("roles.roleid in (?)", 24)
+        .query();
+
+    query.findList();
+
+  }
 }

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

@@ -20,14 +20,13 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase {
     List<OrderAggregate> l0 = Ebean.find(OrderAggregate.class).findList();
 
     for (OrderAggregate r0 : l0) {
-      System.out.println(r0);
+      r0.toString();
     }
 
     List<OrderAggregate> list = Ebean.createNamedQuery(OrderAggregate.class, "total.amount")
         .where().gt("order.id", 0).having().gt("totalAmount", 50).findList();
 
     for (OrderAggregate r1 : list) {
-      System.out.println(r1);
       Assert.assertTrue(r1.getTotalAmount() > 20.50);
       // partial object query without totalItems
       // ... no lazy loading invoked on this type of bean
@@ -38,7 +37,6 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase {
         .having().lt("totalItems", 3).gt("totalAmount", 50).findList();
 
     for (OrderAggregate r2 : l2) {
-      // System.out.println(r2);
       Assert.assertTrue(r2.getTotalItems() < 3);
     }
 

src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java

@@ -25,6 +25,11 @@ public class TestEncrypt extends BaseTestCase {
   @Test
   public void testQueryBind() {
 
+    if (!isH2()) {
+      // only run this on H2 - PGCrypto not happy on CI server
+      return;
+    }
+
     LoggedSqlCollector.start();
     Ebean.find(EBasicEncrypt.class)
         .where().startsWith("description", "Rob")
@@ -67,14 +72,12 @@ public class TestEncrypt extends BaseTestCase {
     q.setParameter("id", e.getId());
 
     SqlRow row = q.findUnique();
-    String name = row.getString("name");
-    Object desc = row.get("description");
-    System.out.println("SqlRow: " + name + " " + desc);
+    row.getString("name");
+    row.get("description");
 
     EBasicEncrypt e1 = Ebean.find(EBasicEncrypt.class, e.getId());
 
-    String desc1 = e1.getDescription();
-    System.out.println("Decrypted: " + desc1 + "  " + e1.getDob());
+    e1.getDescription();
 
     e1.setName("testmod");
     e1.setDescription("moddesc");
@@ -83,8 +86,7 @@ public class TestEncrypt extends BaseTestCase {
 
     EBasicEncrypt e2 = Ebean.find(EBasicEncrypt.class, e.getId());
 
-    String desc2 = e2.getDescription();
-    System.out.println("moddesc=" + desc2);
+    e2.getDescription();
 
     SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null);
     DbEncrypt dbEncrypt = server.getDatabasePlatform().getDbEncrypt();

src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java

@@ -29,18 +29,16 @@ public class TestEncryptBinary extends BaseTestCase {
     q.setParameter("id", e.getId());
 
     SqlRow row = q.findUnique();
-    String name = row.getString("name");
-    Object data = row.get("data");
-    Object someTimeData = row.get("some_time");
-    System.out.println("SqlRow name:" + name + " data:" + data + " someTime:" + someTimeData);
+    row.getString("name");
+    row.get("data");
+    row.get("some_time");
 
     EBasicEncryptBinary e1 = Ebean.find(EBasicEncryptBinary.class, e.getId());
 
     Timestamp t1 = e1.getSomeTime();
-    byte[] data1 = e1.getData();
-    String s = new String(data1);
-    String desc1 = e1.getDescription();
-    System.out.println("Decrypted data:" + s + " desc:" + desc1);
+    e1.getData();
+
+    e1.getDescription();
 
     Assert.assertEquals(t0, t1);
 
@@ -50,9 +48,7 @@ public class TestEncryptBinary extends BaseTestCase {
     Ebean.save(e1);
 
     EBasicEncryptBinary e2 = Ebean.find(EBasicEncryptBinary.class, e.getId());
-
-    String desc2 = e2.getDescription();
-    System.out.println("moddesc=" + desc2);
+    e2.getDescription();
   }
 
 }

src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java

@@ -27,9 +27,6 @@ public class TestSecondaryJoin extends BaseTestCase {
     o0.setStatus(Status.APPROVED);
 
     Ebean.save(o0);
-
-    System.out.println("done");
-
   }
 
 }

src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java

@@ -23,10 +23,6 @@ public class TestByteOnly extends BaseTestCase {
     e2.setContent(content2);
 
     Ebean.save(e2);
-
-    // Ebean.getServer(null).getAutoTune().collectProfiling();
-    // Ebean.getServer(null).getAutoTune().updateTunedQueryInfo();
-    System.out.println("done");
   }
 
 }

src/test/java/com/avaje/tests/basic/one2one/Booking.java

@@ -1,8 +1,7 @@
 package com.avaje.tests.basic.one2one;
 
-import java.util.List;
-
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -12,6 +11,7 @@ import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Version;
+import java.util.List;
 
 @Entity
 @Table(name = "drel_booking")
@@ -19,9 +19,16 @@ public class Booking {
 
 	@Id @GeneratedValue(strategy = GenerationType.SEQUENCE)
 	private Long id;
-	
+
+  @Column(unique = true)
+  Long bookingUid;
+
 	@Version
 	private int version;
+
+  public Booking(Long bookingUid) {
+    this.bookingUid = bookingUid;
+  }
 	
 	@OneToOne(cascade = CascadeType.ALL)
 	@JoinColumn(name = "agent_invoice")	
@@ -31,7 +38,7 @@ public class Booking {
 	@JoinColumn(name = "client_invoice")	
 	private Invoice clientInvoice;
 	
-	@OneToMany(mappedBy = "booking")//, cascade = CascadeType.ALL)
+	@OneToMany(mappedBy = "booking")
 	private List<Invoice> invoices;
 	
 	public Long getId() {
@@ -41,8 +48,16 @@ public class Booking {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public int getVersion() {
+
+  public Long getBookingUid() {
+    return bookingUid;
+  }
+
+  public void setBookingUid(Long bookingUid) {
+    this.bookingUid = bookingUid;
+  }
+
+  public int getVersion() {
 		return version;
 	}
 	
@@ -69,7 +84,7 @@ public class Booking {
 	public List<Invoice> getInvoices() {
 		return invoices;
 	}
-	
+
 	public void setInvoices(List<Invoice> invoices) {
 		this.invoices= invoices;
 	}

src/test/java/com/avaje/tests/basic/one2one/Invoice.java

@@ -21,7 +21,7 @@ public class Invoice {
 	private int version;
 	
 	@ManyToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "booking")
+	@JoinColumn(name = "booking")//_xid", referencedColumnName = "booking_uid")
 	private Booking booking;
 
 	public Long getId() {

src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java

@@ -10,7 +10,9 @@ public class TestOne2OneBookingInvoice extends BaseTestCase {
 
   @Test
   public void test() {
-    Booking b = new Booking();
+
+    Booking b = new Booking(3000L);
+    Ebean.save(b);
 
     Invoice ai = new Invoice();
     Invoice ci = new Invoice();
@@ -23,6 +25,9 @@ public class TestOne2OneBookingInvoice extends BaseTestCase {
 
     Ebean.save(b);
 
+    Invoice invoice = Ebean.find(Invoice.class, ai.getId());
+    Assert.assertEquals(b.getId(), invoice.getBooking().getId());
+
     Booking b1 = Ebean.find(Booking.class, b.getId());
 
     Invoice ai1 = b1.getAgentInvoice();

src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java

@@ -68,7 +68,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase {
         .findList();
 
    for (UUOne uuOne : list) {
-     System.out.println(uuOne.getName());
+     uuOne.getName();
    }
    list.get(0).getName();
 

src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java

@@ -77,7 +77,7 @@ public class TestBatchLazyWithDeleted extends BaseTestCase {
       list.get(2).getMaster().getName();
       Assert.assertTrue(false);
     } catch (EntityNotFoundException e) {
-      // this bean was deleted and lazy loading failed 
+      // this bean was deleted and lazy loading failed
       Assert.assertTrue(true);
     }
 

src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java

@@ -34,8 +34,6 @@ public class TestLazyLoadEmptyCollection extends BaseTestCase {
       for (Contact contact : contacts) {
         contact.getNotes();
       }
-      System.out.println(customer);
-      System.out.println(contacts);
     }
 
   }

src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistentBean.java

@@ -0,0 +1,31 @@
+package com.avaje.tests.batchload;
+
+import java.util.UUID;
+
+import javax.persistence.EntityNotFoundException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.UUOne;
+
+public class TestLazyLoadNonExistentBean extends BaseTestCase {
+
+  @Test
+  public void testSimple() {
+
+    UUID uuid = UUID.randomUUID();
+    UUOne one = Ebean.getReference(UUOne.class, uuid);
+
+    try {
+      // invoke lazy loading
+      one.getName();
+      Assert.assertTrue(false);
+    } catch (EntityNotFoundException e) {
+      // expecting this
+      Assert.assertTrue(true);
+    }
+  }
+}

src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java

@@ -71,10 +71,6 @@ public class TestCacheCollectionIds extends BaseTestCase {
     int currentNumContacts2 = fetchCustomer(customer.getId());
     Assert.assertEquals(currentNumContacts + 1, currentNumContacts2);
 
-    System.out.println("custCache:" + custCache.getStatistics(false));
-    System.out.println("contactCache:" + contactCache.getStatistics(false));
-    System.out.println("custManyIdsCache:" + custManyIdsCache.getStatistics(false));
-
   }
 
   private int fetchCustomer(Integer id) {

src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java

@@ -1,5 +1,7 @@
 package com.avaje.tests.cache;
 
+import com.avaje.ebeaninternal.server.autotune.model.Origin;
+import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -14,6 +16,13 @@ import com.avaje.tests.model.basic.FeatureDescription;
 
 public class TestL2CacheWithSharedBean extends BaseTestCase {
 
+  @NotNull
+  private TunedQueryInfo createTunedQueryInfo(OrmQueryDetail tunedDetail) {
+    Origin origin = new Origin();
+    origin.setDetail(tunedDetail.toString());
+    return new TunedQueryInfo(origin);
+  }
+
   @Test
   public void test() {
 
@@ -28,7 +37,7 @@ public class TestL2CacheWithSharedBean extends BaseTestCase {
 
     OrmQueryDetail tunedDetail = new OrmQueryDetail();
     tunedDetail.select("name");
-    TunedQueryInfo tunedInfo = new TunedQueryInfo(tunedDetail);
+    TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail);
 
     Query<FeatureDescription> query = Ebean.find(FeatureDescription.class).setId(f1.getId());
 

src/test/java/com/avaje/tests/changelog/TestChangeLog.java

@@ -102,9 +102,6 @@ public class TestChangeLog extends BaseTestCase {
       this.changes = changes;
       try {
         String json = objectMapper.writeValueAsString(changes);
-
-        logger.info(json);
-
         ChangeSet changes1 = objectMapper.readValue(json, ChangeSet.class);
 
         assertEquals(changes.getTxnId(), changes1.getTxnId());

src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java

@@ -3,6 +3,7 @@ package com.avaje.tests.compositekeys;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.avaje.ebean.PagedList;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -51,6 +52,8 @@ public class TestCKeyLazyLoad extends BaseTestCase {
 
     Ebean.save(p2);
 
+    exerciseMaxRowsQuery_with_embeddedId();
+
     CKeyParentId searchId = new CKeyParentId(1, "one");
 
     CKeyParent found = Ebean.find(CKeyParent.class).where().idEq(searchId).findUnique();
@@ -79,4 +82,15 @@ public class TestCKeyLazyLoad extends BaseTestCase {
     Assert.assertTrue(idInTestList.size() == 2);
 
   }
+
+  /**
+   * Exercise paging/maxRows type query with EmbeddedId.
+   */
+  private void exerciseMaxRowsQuery_with_embeddedId() {
+
+    PagedList<CKeyParent> siteUserPage = Ebean.find(CKeyParent.class).where()
+        .orderBy("name asc")
+        .findPagedList(0, 10);
+    siteUserPage.getList();
+  }
 }

src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java

@@ -2,7 +2,8 @@ package com.avaje.tests.inheritance;
 
 import java.util.List;
 
-import org.junit.Assert;
+import com.avaje.tests.model.basic.CarAccessory;
+import com.avaje.tests.model.basic.CarFuse;
 import org.junit.Test;
 
 import com.avaje.ebean.BaseTestCase;
@@ -13,6 +14,11 @@ import com.avaje.tests.model.basic.Truck;
 import com.avaje.tests.model.basic.Vehicle;
 import com.avaje.tests.model.basic.VehicleDriver;
 
+import static org.assertj.core.api.StrictAssertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 public class TestInheritInsert extends BaseTestCase {
 
   @Test
@@ -25,11 +31,11 @@ public class TestInheritInsert extends BaseTestCase {
     Vehicle v = Ebean.find(Vehicle.class, t.getId());
     if (v instanceof Truck) {
       Truck t0 = (Truck) v;
-      Assert.assertEquals(Double.valueOf(10d), t0.getCapacity());
-      Assert.assertEquals(Double.valueOf(10d), ((Truck) v).getCapacity());
-      Assert.assertNotNull(t0.getId());
+      assertEquals(Double.valueOf(10d), t0.getCapacity());
+      assertEquals(Double.valueOf(10d), ((Truck) v).getCapacity());
+      assertNotNull(t0.getId());
     } else {
-      Assert.assertTrue("v not a Truck?", false);
+      assertTrue("v not a Truck?", false);
     }
 
     VehicleDriver driver = new VehicleDriver();
@@ -42,17 +48,17 @@ public class TestInheritInsert extends BaseTestCase {
     v = d1.getVehicle();
     if (v instanceof Truck) {
       Double capacity = ((Truck) v).getCapacity();
-      Assert.assertEquals(Double.valueOf(10d), capacity);
-      Assert.assertNotNull(v.getId());
+      assertEquals(Double.valueOf(10d), capacity);
+      assertNotNull(v.getId());
     } else {
-      Assert.assertTrue("v not a Truck?", false);
+      assertTrue("v not a Truck?", false);
     }
 
     List<VehicleDriver> list = Ebean.find(VehicleDriver.class).findList();
     for (VehicleDriver vehicleDriver : list) {
       if (vehicleDriver.getVehicle() instanceof Truck) {
         Double capacity = ((Truck) vehicleDriver.getVehicle()).getCapacity();
-        Assert.assertEquals(Double.valueOf(10d), capacity);
+        assertEquals(Double.valueOf(10d), capacity);
       }
     }
   }
@@ -73,12 +79,12 @@ public class TestInheritInsert extends BaseTestCase {
     query.where().eq("vehicle.licenseNumber", "MARIOS_CAR_LICENSE");
     List<VehicleDriver> drivers = query.findList();
 
-    Assert.assertNotNull(drivers);
-    Assert.assertEquals(1, drivers.size());
-    Assert.assertNotNull(drivers.get(0));
+    assertNotNull(drivers);
+    assertEquals(1, drivers.size());
+    assertNotNull(drivers.get(0));
 
-    Assert.assertEquals("Mario", drivers.get(0).getName());
-    Assert.assertEquals("MARIOS_CAR_LICENSE", drivers.get(0).getVehicle().getLicenseNumber());
+    assertEquals("Mario", drivers.get(0).getName());
+    assertEquals("MARIOS_CAR_LICENSE", drivers.get(0).getVehicle().getLicenseNumber());
 
     Vehicle car2 = Ebean.find(Vehicle.class, car.getId());
 
@@ -86,4 +92,34 @@ public class TestInheritInsert extends BaseTestCase {
     Ebean.save(car);
 
   }
+
+  @Test
+  public void test_AtOrderBy_on_ChildOfChild() {
+
+    Car car = new Car();
+    car.setLicenseNumber("ABC");
+    Ebean.save(car);
+
+    CarFuse fuse = new CarFuse();
+    fuse.setLocationCode("xdfg");
+    Ebean.save(fuse);
+
+    CarAccessory accessory = new CarAccessory(car, fuse);
+    Ebean.save(accessory);
+
+
+    Query<Car> query = Ebean.find(Car.class)
+        .fetch("accessories")
+        .where()
+        .eq("id", car.getId())
+        .query();
+
+    Car result = query.findUnique();
+
+    assertThat(query.getGeneratedSql()).contains("order by t0.id, t2.location_code");
+    assertThat(query.getGeneratedSql()).contains("left outer join car_fuse t2 on t2.id = t1.fuse_id");
+
+    assertNotNull(result);
+  }
+
 }

src/test/java/com/avaje/tests/json/include/TestJsonExcludeTransientEmptyList.java

@@ -2,12 +2,15 @@ package com.avaje.tests.json.include;
 
 import com.avaje.ebean.Ebean;
 import com.avaje.ebean.config.JsonConfig;
+import com.avaje.ebean.text.PathProperties;
 import com.avaje.ebean.text.json.JsonWriteOptions;
+import com.avaje.tests.json.transientproperties.EJsonTransientEntityList;
 import com.avaje.tests.json.transientproperties.EJsonTransientList;
 import org.junit.Test;
 
 import java.util.ArrayList;
 
+import static org.assertj.core.api.StrictAssertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public class TestJsonExcludeTransientEmptyList {
@@ -45,4 +48,18 @@ public class TestJsonExcludeTransientEmptyList {
 
     assertEquals(expectedJson, asJson);
   }
+
+  @Test
+  public void testToJson_with_transientExcludeFromPathProperties() throws Exception {
+
+    EJsonTransientEntityList bean = new EJsonTransientEntityList();
+    bean.setId(99L);
+    bean.setName("John");
+
+    PathProperties pathProps = PathProperties.parse("id,name");
+
+    String asJson = Ebean.json().toJson(bean, pathProps);
+
+    assertThat(asJson).isEqualTo("{\"id\":99,\"name\":\"John\"}");
+  }
 }

src/test/java/com/avaje/tests/json/transientproperties/EJsonTransientEntityList.java

@@ -0,0 +1,57 @@
+package com.avaje.tests.json.transientproperties;
+
+import com.avaje.ebean.annotation.Sql;
+import com.avaje.tests.model.basic.Order;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Sql
+@Entity
+public class EJsonTransientEntityList {
+
+  @Id
+  private Long id;
+
+  private String name;
+
+  @Transient
+  private Boolean basic;
+
+  @Transient
+  private List<Order> orders;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Boolean getBasic() {
+    return basic;
+  }
+
+  public void setBasic(Boolean basic) {
+    this.basic = basic;
+  }
+
+  public List<Order> getOrders() {
+    return orders;
+  }
+
+  public void setOrders(List<Order> orders) {
+    this.orders = orders;
+  }
+}

src/test/java/com/avaje/tests/json/transientproperties/ModelA.java

@@ -0,0 +1,46 @@
+package com.avaje.tests.json.transientproperties;
+
+import com.avaje.ebean.annotation.Sql;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Sql
+@Entity
+public class ModelA {
+
+  @Id
+  int id;
+
+  String a;
+
+  // transient mapping to an entity bean
+  @Transient
+  List<ModelB> list;
+
+  public String getA() {
+    return a;
+  }
+
+  public void setA(String a) {
+    this.a = a;
+  }
+
+  public List<ModelB> getList() {
+    return list;
+  }
+
+  public void setList(List<ModelB> list) {
+    this.list = list;
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+}

src/test/java/com/avaje/tests/json/transientproperties/ModelB.java

@@ -0,0 +1,31 @@
+package com.avaje.tests.json.transientproperties;
+
+
+import com.avaje.ebean.annotation.Sql;
+
+import javax.persistence.Entity;
+
+@Sql
+@Entity
+public class ModelB {
+
+  Integer oneField;
+
+  Integer twoField;
+
+  public Integer getOneField() {
+    return oneField;
+  }
+
+  public void setOneField(Integer oneField) {
+    this.oneField = oneField;
+  }
+
+  public Integer getTwoField() {
+    return twoField;
+  }
+
+  public void setTwoField(Integer twoField) {
+    this.twoField = twoField;
+  }
+}

src/test/java/com/avaje/tests/json/transientproperties/TestModelAJson.java

@@ -0,0 +1,34 @@
+package com.avaje.tests.json.transientproperties;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.text.PathProperties;
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+import static org.assertj.core.api.StrictAssertions.assertThat;
+
+public class TestModelAJson {
+
+  @Test
+  public void test() {
+
+    ModelA a = new ModelA();
+    a.setId(1);
+    a.setA("a");
+
+    ModelB b = new ModelB();
+    b.setOneField(1);
+    b.setTwoField(1);
+
+    a.setList(new ArrayList<ModelB>());
+    a.getList().add(b);
+
+    PathProperties pathProperties = PathProperties.parse("(a,list(oneField))");
+
+    String json = Ebean.json().toJson(a, pathProperties);
+
+    assertThat(json).isEqualTo("{\"a\":\"a\",\"list\":[{\"oneField\":1}]}");
+
+  }
+}

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

@@ -1,51 +1,51 @@
 package com.avaje.tests.model.basic;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
 import javax.persistence.Inheritance;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import java.util.HashSet;
+import java.util.Set;
 
 @Entity
 @Inheritance
 @DiscriminatorValue("C")
 public class Car extends Vehicle {
 
-	private static final long serialVersionUID = 4716705779684333446L;
+  private static final long serialVersionUID = 4716705779684333446L;
 
-	private String driver;
+  private String driver;
 
-	
-	@ManyToOne
-	TruckRef carRef;
-	
-	@OneToMany(mappedBy="car")
-	private Set<CarAccessory> accessories = new HashSet<CarAccessory>();
-	
-	public String getDriver() {
-		return driver;
-	}
+  @ManyToOne
+  TruckRef carRef;
 
-	public void setDriver(String driver) {
-		this.driver = driver;
-	}
+  @OneToMany(mappedBy = "car")
+  @OrderBy("fuse.locationCode")
+  private Set<CarAccessory> accessories = new HashSet<CarAccessory>();
 
-	public TruckRef getCarRef() {
-		return carRef;
-	}
+  public String getDriver() {
+    return driver;
+  }
 
-	public void setCarRef(TruckRef carRef) {
-		this.carRef = carRef;
-	}
+  public void setDriver(String driver) {
+    this.driver = driver;
+  }
 
-	public Set<CarAccessory> getAccessories() {
-		return accessories;
-	}
+  public TruckRef getCarRef() {
+    return carRef;
+  }
 
-	public void setAccessories(Set<CarAccessory> accessories) {
-		this.accessories = accessories;
-	}
+  public void setCarRef(TruckRef carRef) {
+    this.carRef = carRef;
+  }
+
+  public Set<CarAccessory> getAccessories() {
+    return accessories;
+  }
+
+  public void setAccessories(Set<CarAccessory> accessories) {
+    this.accessories = accessories;
+  }
 }

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

@@ -4,28 +4,44 @@ import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 
 @Entity
-public class CarAccessory extends BasicDomain{
-	
-    private static final long serialVersionUID = 1L;
+public class CarAccessory extends BasicDomain {
 
-    private String name;
-	
-	@ManyToOne
-	private Car car;
+  private static final long serialVersionUID = 1L;
 
-	public String getName() {
-		return name;
-	}
+  private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
+  @ManyToOne(optional = false)
+  private CarFuse fuse;
 
-	public Car getCar() {
-		return car;
-	}
+  @ManyToOne
+  private Car car;
 
-	public void setCar(Car car) {
-		this.car = car;
-	}
+  public CarAccessory(Car car, CarFuse fuse) {
+    this.car = car;
+    this.fuse = fuse;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Car getCar() {
+    return car;
+  }
+
+  public void setCar(Car car) {
+    this.car = car;
+  }
+
+  public CarFuse getFuse() {
+    return fuse;
+  }
+
+  public void setFuse(CarFuse fuse) {
+    this.fuse = fuse;
+  }
 }

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

@@ -0,0 +1,29 @@
+package com.avaje.tests.model.basic;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class CarFuse {
+
+  @Id
+  Long id;
+
+  String locationCode;
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getLocationCode() {
+    return locationCode;
+  }
+
+  public void setLocationCode(String locationCode) {
+    this.locationCode = locationCode;
+  }
+}

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

@@ -1,95 +1,88 @@
 package com.avaje.tests.model.basic;
 
-import java.util.List;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+import java.util.List;
 
 @Entity
+@Table(name = "mrole")
 public class MRole {
 
-	@Id
-	Integer roleid;
-	
-	String roleName;
+  @Id
+  Integer roleid;
 
-	@ManyToMany(cascade=CascadeType.ALL
-//	@JoinTable(name="myint_table"//, 
-//		joinColumns={
-//			@JoinColumn(name="mroleid", referencedColumnName="roleid")
-//		}//,
-//		inverseJoinColumns={
-//			@JoinColumn(name = "muserid", referencedColumnName="userid")
-//		}
-	
-	)
-	List<MUser> users;
-	
-    public MRole() {
-        
+  String roleName;
+
+  @ManyToMany(cascade = CascadeType.ALL)
+  List<MUser> users;
+
+  public MRole() {
+
+  }
+
+  public MRole(String roleName) {
+    this.roleName = roleName;
+  }
+
+  public Integer getRoleid() {
+    return roleid;
+  }
+
+  public void setRoleid(Integer roleid) {
+    this.roleid = roleid;
+  }
+
+  public String getRoleName() {
+    return roleName;
+  }
+
+  public void setRoleName(String roleName) {
+    this.roleName = roleName;
+  }
+
+  public List<MUser> getUsers() {
+    return users;
+  }
+
+  public void setUsers(List<MUser> users) {
+    this.users = users;
+  }
+
+  @Override
+  public String toString() {
+    return "MRole [roleName=" + roleName + "]";
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    if (this == other) {
+      return true;
     }
-    
-    public MRole(String roleName) {
-        this.roleName = roleName;
+
+    // Make sure other is not null and has the same class as this
+    if (other != null && getClass().equals(other.getClass())) {
+      final MRole rhs = (MRole) other;
+      if (roleid.equals(rhs.roleid)) {
+        if (roleid == 0) {
+          return false;
+        } else {
+          return true;
+        }
+      }
     }
-    
-	public Integer getRoleid() {
-		return roleid;
-	}
+    return false;
+  }
 
-	public void setRoleid(Integer roleid) {
-		this.roleid = roleid;
-	}
+  @Override
+  public int hashCode() {
+    if (roleid != null && roleid != 0) {
+      int rid = roleid;
+      return (int) (rid ^ (rid >>> 32));
+    }
+    return super.hashCode();
+  }
 
-	public String getRoleName() {
-		return roleName;
-	}
-
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
-
-	public List<MUser> getUsers() {
-		return users;
-	}
-
-	public void setUsers(List<MUser> users) {
-		this.users = users;
-	}
-
-	@Override
-	public String toString() {
-		return "MRole [roleName=" + roleName + "]";
-	}
-	@Override
-	public boolean equals(Object other) {
-		if (this == other){
-			return true;
-		}
-
-		// Make sure other is not null and has the same class as this
-		if (other != null && getClass().equals(other.getClass())){
-			final MRole rhs = (MRole)other; 
-			if ( roleid.equals(rhs.roleid)){
-				if (roleid == 0){
-					return false;
-				}else{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		if (roleid != null && roleid != 0){
-			int rid = roleid;
-			return (int)( rid ^ (rid >>> 32) );
-		}
-		return super.hashCode();
-	}
-	
 }

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

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.persistence.*;
 
 @Entity
+@Table(name="muser")
 public class MUser {
 
 	@Id

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

@@ -2,8 +2,10 @@ package com.avaje.tests.model.basic;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
+@Table(name="muser_type")
 public class MUserType {
 
 	@Id

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

@@ -21,7 +21,7 @@ public class OrderDetail implements Serializable {
     @Id
     Integer id;
 
-    @ManyToOne
+    @ManyToOne(optional = false)
     Order order;
 
     Integer orderQty;

src/test/java/com/avaje/tests/model/onetoone/OCompany.java

@@ -0,0 +1,21 @@
+package com.avaje.tests.model.onetoone;
+
+import com.avaje.tests.model.basic.BasicDomain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Entity
+public class OCompany extends BasicDomain {
+
+  @Column(length = 50, unique = true)
+  public String corpId;
+
+  public String getCorpId() {
+    return corpId;
+  }
+
+  public void setCorpId(String corpId) {
+    this.corpId = corpId;
+  }
+}

src/test/java/com/avaje/tests/model/onetoone/ORoadShowMsg.java

@@ -0,0 +1,24 @@
+package com.avaje.tests.model.onetoone;
+
+import com.avaje.tests.model.basic.BasicDomain;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+
+@Entity
+public class ORoadShowMsg extends BasicDomain {
+
+  @OneToOne(cascade = CascadeType.ALL, optional = false)
+  @JoinColumn()//(name = "corp_id", nullable = false, referencedColumnName = "corp_id")
+  public OCompany company;
+
+  public OCompany getCompany() {
+    return company;
+  }
+
+  public void setCompany(OCompany company) {
+    this.company = company;
+  }
+}

src/test/java/com/avaje/tests/model/onetoone/TestOneToOneJoinColumn.java

@@ -0,0 +1,20 @@
+package com.avaje.tests.model.onetoone;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
+import org.junit.Test;
+
+public class TestOneToOneJoinColumn extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    ORoadShowMsg msg = new ORoadShowMsg();
+    OCompany company = new OCompany();
+    company.setCorpId("corp_id_1000000");
+    msg.setCompany(company);
+
+    Ebean.save(msg);
+    Ebean.find(ORoadShowMsg.class, msg.getId());
+  }
+}