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

pom.xml

@@ -9,11 +9,11 @@
 
   <groupId>org.avaje.ebeanorm</groupId>
   <artifactId>avaje-ebeanorm</artifactId>
-  <version>6.14.1</version>
+  <version>6.15.1</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>

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/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/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/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/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/resources/META-INF/services/com.avaje.ebeaninternal.api.SpiEbeanPlugin

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

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/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/resources/ebean.properties

@@ -117,6 +117,8 @@ datasource.pg.databaseDriver=org.postgresql.Driver
 
 datasource.ms.username=test
 datasource.ms.password=test
-datasource.ms.databaseUrl=jdbc:sqlserver://192.168.1.70:1433;databaseName=test
+datasource.ms.databaseUrl=jdbc:sqlserver://192.168.1.67:1433;databaseName=test
 datasource.ms.databaseDriver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-
+#datasource.ms.databaseUrl=jdbc:jtds:sqlserver://192.168.1.67:1433/test
+#datasource.ms.databaseDriver=net.sourceforge.jtds.jdbc.Driver
+#datasource.ms.heartbeatsql=select 1